Commit Graph

216 Commits

Author SHA1 Message Date
Bo Peng
c267eec1c9 lib/lyx2lyx/lyx_1_5.py: replace tab with spaces
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14322 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 20:09:43 +00:00
Georg Baum
0c0c43b8eb merge booktabs branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14319 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 19:13:56 +00:00
Bo Peng
34001ec175 Remove all tabs in lib/lyx2lyx/*.py, corresponding to the added -tt option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14285 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-01 19:16:09 +00:00
Georg Baum
4ae87a3bb8 Call python with the -tt switch to make mixed tab/space indentation an error
* src/support/os.[Ch]
	(python): new function, return the python command

	* lib/lyx2lyx/lyx_1_5.py
	(revert_font_settings): replace tabs with spaces

The rest is simply s/python/python -tt/ and
s/"python"/lyx::support::os::python()/ where appropriate.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14270 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-30 13:54:01 +00:00
Jürgen Spitzmüller
54acb900ad The Grand Font Selection Redesign:
* lib/lyx2lyx/LyX.py (format_relation): add file format 247 (from Georg BAUM).

        * lib/lyx2lyx/lyx_1_5.py: add convert_font_settings, revert_font_settings (from Georg BAUM).

        * lib/chkconfig.ltx: Test for newly supported font packages

        * lib/doc/LaTeXConfig.lyx.in: document newly supported font packages

        * lib/doc/UserGuide.lyx: document new UI.

        * lib/doc/Extended.lyx: update PostScript font documentation

        * development/FORMAT: document file format change 246->247.

        * src/tex-strings.[Ch]: new strings tex_fonts_roman, tex_fonts_sans, 
           tex_fonts_monospaced (with GUI equivalents).

        * src/buffer.C: Format up to 247.

        * src/bufferparams.C:
        new params fontsRoman, fontsSans, fontsTypewriter, fontsDefaultFamily,    
        fontsSC, fontsOSF, fontsSansScale and fontsTypewriterScale
        (LyXFont const BufferParams::getFont): consider switch of default family.
        (string const BufferParams::loadFonts): new method to get all the LaTeX 
        font stuff done.

        * src/paragraph.C
        (LyXFont const Paragraph::getFont):
        (LyXFont const Paragraph::getLabelFont):
        (LyXFont const Paragraph::getLayoutFont): user buffer's not textclass's 
        default font

        * src/text.C
        (int LyXText::leftMargin):
        (int LyXText::rightMargin): user buffer's not textclass's default font

        * src/text2.C
        (LyXFont LyXText::getFont):
        (LyXFont LyXText::getLayoutFont):
        (LyXFont LyXText::getLabelFont): check if the family of the default document 
        font has been customized.

        * src/frontends/gtk/GDocument.[Ch]: implement new font ui (from Georg BAUM).

        * src/frontends/gtk/glade/document.glade: implement new font ui (from Georg BAUM). 

        * src/frontends/qt3/Makefile.dialogs: add new FontModuleBase

        * src/frontends/qt3/ui/FontModuleBase.ui: new File

        * src/frontends/qt3/ui/TextLayoutModuleBase.ui: remove font widgets

        * src/frontends/qt3/QDocument.C
        * src/frontends/qt3/QDocumentDialog.[Ch]: implement new font ui

        * src/frontends/qt4/Makefile.dialogs: add new FontUi

        * src/frontends/qt4/QDocumentDialog.[Ch]: implement new font ui

        * src/frontends/qt4/ui/FontUi.ui: new File

        * src/frontends/qt4/ui/TextLayoutUi.ui: remove font widgets

        * src/frontends/qt4/ui/compile_uic.sh: add new FontUi

        * src/frontends/xforms/FormDocument.[Ch]: implement new font ui

        * src/frontends/xforms/forms/form_document.fd: add new font tab.

        * src/frontends/controllers/ControlDocument.[Ch]
        (char ControlDocument::fontfamilies):
        (char ControlDocument::fontfamilies_gui):
        (bool ControlDocument::isFontAvailable):
        (bool ControlDocument::providesSC):
        (bool ControlDocument::providesOSF):
        (bool ControlDocument::providesScale): new methods, providing font info.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14143 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 08:10:17 +00:00
Georg Baum
5bb791e841 * lib/lyx2lyx/Makefile.am: Add missing file lyx_1_5.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14013 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-05 19:24:18 +00:00
Martin Vermeer
1a77233c5f Add support for framed.sty
* src/LaTeXFeatures.C: add framed.sty

	(const * simplefeatures[]: add framed.sty
	(const LaTeXFeatures::getPackages): define shadecolor

	* src/insets/insetnote.h

	* src/insets/insetnote.C
	(const init_notetranslator):
	(InsetNote::setButtonLabel): add Framed and Shaded
	(InsetNote::latex): add output
	(InsetNote::validate): require framed.sty

	* src/buffer.C
	(BufferList bufferlist): new LyX version 246

	* src/frontends/qt3/ui/QNoteDialogBase.ui: add

	* src/frontends/qt3/QNoteDialog.C: add

	* src/frontends/qt3/QNote.C
	(QNote::update_contents): add framed, shaded
	(QNote::apply): add framed, shaded

	* src/LColor.[Ch]: add background colour for shaded

	* lib/lyx2lyx/LyX.py: New version support

	* lib/lyx2lyx/lyx_1_5.py: convert/revert

	* lib/chkconfig.ltx: add framed.sty

	* src/frontends/xforms/FormNote.C
	(FormNote::build):
	(FormNote::update): add FIXME

	* src/frontends/gtk/GNote.C
	(GNote::doBuild):
	(GNote::update):
	(GNote::apply): add FIXME

	* development/FORMAT: document format increase



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13993 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-03 16:46:27 +00:00
Lars Gullik Bjønnes
3708dc6ec5 update ignore, and make sure to dist the lyx2lyx_version.py.in template file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13728 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-24 13:34:16 +00:00
Martin Vermeer
f6848c168b * lyx_1_4.py
(convert_minipage): Proper handling of default height and 
	vertical position (bug report Garst Reese)



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13697 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-20 07:43:29 +00:00
José Matox
69664082da * configure.ac
* lib/lyx2lyx/lyx2lyx_version.py.in
        * lib/lyx2lyx/Makefile.am

	Add lyx2lyx_version.py to distribution.

        * lib/lyx2lyx/LyX.py
	Use lyx version as the same version of lyx2lyx.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13626 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-10 16:18:31 +00:00
José Matox
bb23ef468d parser_tools.py (find_tokens, find_tokens_exact): replace range with xrange.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13625 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-10 15:50:31 +00:00
José Matox
44aad9d818 lyx_1_4.py(convert_sgml_paragraphs):
convert SGML paragraphs to Standard + ERT, as SGML are not used anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13616 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-10 09:14:08 +00:00
José Matox
98e729c767 Update version of lyx2lyx to 1.5.0svn
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13592 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-07 16:15:14 +00:00
José Matox
22212a0d65 Add placeholders for future changes:
lyx_0_10.py: File format between 2.00 (the first publicaly available) and 2.10
lyx_1_5.py: Post-1.4.x file formats.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13591 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-07 16:11:16 +00:00
Georg Baum
8d914e2c52 * parser_tools.py (find_tokens_exact): new, extract tokens with
exact match
        * parser_tools.py (find_token2): rename to find_token_exact and make
        it work for tokens with spaces
        * lyx_1_4.py (revert_box, convert_collapsable, revert_bibtopic,
        convert_float): use find_token(s)_exact instead of find_token(s).
        This does not match "FloatList" when "Float" is searched (bug 2245)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13410 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-17 09:52:13 +00:00
José Matox
d5da885f21 Only reset the papersize for a4* paperpackages.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13312 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-07 11:21:08 +00:00
Georg Baum
3a56dd160f fix bug 2314
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13267 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-22 17:05:12 +00:00
Georg Baum
b8227ebda0 fix bug 2026 and bug 2088
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13226 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-13 07:48:26 +00:00
Lars Gullik Bjønnes
4a7ab830bc Delete all .cvsignore files from trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13208 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-10 22:09:45 +00:00
Georg Baum
d55a7468c0 fix bug 2244 (branch removal)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10804 a592a061-630c-0410-9148-cb99ea01b6c8
2006-02-02 21:30:04 +00:00
José Matox
7aef3c80cf fix lyx2lyx bug dealing with compressed files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10640 a592a061-630c-0410-9148-cb99ea01b6c8
2005-12-01 19:00:07 +00:00
José Matox
73f01338a2 Fix second part of bug 666 (I\'m not joking). Complete support for older tabular, only the 3 was missing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10618 a592a061-630c-0410-9148-cb99ea01b6c8
2005-11-24 12:25:26 +00:00
Georg Baum
a9bfd2b130 fix bug 2131
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10613 a592a061-630c-0410-9148-cb99ea01b6c8
2005-11-21 17:05:03 +00:00
Jürgen Spitzmüller
0ce45c32b6 fix bug 2090 (remove param \quotes_times). File format is up to 245 now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10549 a592a061-630c-0410-9148-cb99ea01b6c8
2005-10-13 10:59:39 +00:00
Georg Baum
aba9a83f22 forgotten fixes for bug 2027
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10494 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-28 14:29:23 +00:00
Jürgen Spitzmüller
82765345ac fix space insets, increase version to 244.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10490 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-28 09:40:50 +00:00
Georg Baum
53a118caea fix bug 2031 (\lyxline conversion)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10466 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-20 12:47:45 +00:00
Georg Baum
3d9554fd62 small fix for TOC file generation in LyX.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10460 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-19 11:31:26 +00:00
José Matox
568ae274e5 fix vertical alignment convertion for tables in format 216.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10434 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-09 15:23:09 +00:00
Georg Baum
c8c616688f fix bug 1990
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10411 a592a061-630c-0410-9148-cb99ea01b6c8
2005-09-05 07:06:11 +00:00
Georg Baum
9826fde5c9 fix bug 2004
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10408 a592a061-630c-0410-9148-cb99ea01b6c8
2005-08-30 07:23:20 +00:00
José Matox
a0c546831e fix bug 2001
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10407 a592a061-630c-0410-9148-cb99ea01b6c8
2005-08-29 18:43:15 +00:00
José Matox
7bd4678da5 Separate preamble from from header. Make its treatment more robust.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10398 a592a061-630c-0410-9148-cb99ea01b6c8
2005-08-18 17:33:26 +00:00
José Matox
24355f90da add \\leftindent to the list of allowed paragraph parameters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10395 a592a061-630c-0410-9148-cb99ea01b6c8
2005-08-11 22:31:05 +00:00
José Matox
888342b465 Take into account the lines added to preamble.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10375 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-29 13:34:07 +00:00
José Matox
a69c7f771d Fix a4 package removal when the preamble is already there.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10374 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-29 11:22:18 +00:00
José Matox
255c2c247f Fix widemargins a4 convertion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10372 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-29 09:54:50 +00:00
José Matox
2479ac8f5f Added a more precise date and details about 222 to 223 change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10371 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-29 09:39:17 +00:00
José Matox
4c2d658257 Put back support for format 222.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10370 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-29 09:23:19 +00:00
José Matox
85eed78238 remove wrong comments and add 1.3.6 to the list of releases
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10347 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-22 15:03:44 +00:00
José Matox
7b8d863cb3 small fixes to minipages convertions and retroversions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10334 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-18 18:37:05 +00:00
José Matox
54502b890e fix two typos converting frenchb (Thanks to Georg)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10327 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-18 14:46:53 +00:00
José Matox
8ed68ea860 convert frenchb language also in the body
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10304 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-17 23:55:05 +00:00
José Matox
9745fb8187 Remove the support for a4.sty, a4wide.sty and a4widemargins from lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10273 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-17 11:17:13 +00:00
José Matox
dc3e0ae6e0 add python support to configure
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10221 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-15 16:38:59 +00:00
José Matox
2796b1fe32 fix lyx2lyx bugs for revertion to 221.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10172 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-12 21:27:12 +00:00
José Matox
b666ae90e3 Support old tables format 1.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10150 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-08 09:13:51 +00:00
José Matox
219f6bdb6e Remove latexdel insets comming from sgml2lyx (ref, url and htmlurl).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10148 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-08 08:49:29 +00:00
Jean-Marc Lasgouttes
108d74bc1a clean up french language handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10145 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-07 10:51:58 +00:00
José Matox
32ab25b3cb Ignore whitelines on header. Fix reading the first body line.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10144 a592a061-630c-0410-9148-cb99ea01b6c8
2005-07-07 09:19:50 +00:00