Commit Graph

243 Commits

Author SHA1 Message Date
Georg Baum
b02242bfaf Rework InsetCommandParams interface and file storage
* src/insets/insetcommandparams.[Ch]:
	(operator[]): New, access a parameter
	(clear): New, clear all parameters
	(info_): New, stire info about this command
	(cmdname): Rename to name_
	(contents, options, sec_options): Replace with params_. Parameters
	are now stored as docstring.
	(findInfo): New factor for command info for all commands
	(read, write): Use new syntax
	(parameter set and get methods): reimplemenmt for new parameter storage

	* src/insets/insetcommand.h
	(getParam): New, get a parameter
	(setParam): New, set a parameter
	(parameter set and get methods): Adjust to InsetCommandParams changes

	* src/insets/insetbibitem.[Ch]
	(write): Remove, not needed anymore
	(directWrite): ditto

	* src/insets/insetbibitem.C
	(InsetBibitem::read): Use InsetCommand::read

	* src/insets/insetref.C
	(InsetRef::latex): Use new InsetCommandParams interface

	* src/mathed/InsetMathHull.C
	(InsetMathHull::doDispatch): ditto

	* src/text3.C
	(LyXText::dispatch): ditto

	* src/factory.C
	(createInset): Create InsetCommandParams with command name
	(readInset): ditto
	(readInset): Remove error message for bibitem, since bibitem is
	now a normal command inset

	* src/buffer.C: Bump file format number

	* src/frontends/controllers/ControlCommand.[Ch]
	(ControlCommand): take an additional command name parameter

	* src/text.C
	(readParToken): Remove code for \bibitem

	* lib/lyx2lyx/LyX.py: Bump latest file format number

	* lib/lyx2lyx/lyx_1_5.py
	(convert_bibitem, convert_commandparams): new, convert to new format
	(revert_commandparams): new, convert to old format

	* development/FORMAT: document new format

	* many other files: Adjust to the changes above


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15357 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-17 21:07:16 +00:00
Jürgen Spitzmüller
c0a61f6c18 * lib/lyx2lyx/lyx_1_5.py: correct indendation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15349 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-16 11:41:57 +00:00
Jürgen Spitzmüller
77e145a406 Remember the char style label state and make it globally switchable.
* src/buffer: 
	file format incrementation to 251
* src/insets/insetcharstyle.[Ch]:
	- make show_label a param and save its state
	- let all-insets-toggle togle the label in charstyles
* development/FORMAT: 
	document file format change
* lib/lyx2lyx/LyX.py:
	add new file format
* lib/lyx2lyx/lyx_1_5.py:
	remove char style label param on reversion to 250.
	

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15345 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-16 07:06:41 +00:00
Enrico Forestieri
6f62c98e31 Small fix for the last version bump
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15318 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-12 23:28:20 +00:00
Martin Vermeer
21316375fe Support for optional arguments for environments. No material format change.
* src/buffer.C
	(BufferList bufferlist;): bump version

	* src/output_latex.C
	TexEnvironment: add optarg for environments

	* lib/lyx2lyx/lyx_1_5.py: add converters

	* development/FORMAT: document



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15315 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-12 20:21:14 +00:00
Georg Baum
9245b426b3 Update file format for unicode
* src/buffer.C
	(LYX_FORMAT): update

	* src/bufferparams.h
	(inputenc): document

	* lib/lyx2lyx/LyX.py
	(format_relation): last format is now 249
	(get_encoding): return utf8 for formats > 248

	* lib/lyx2lyx/lyx_1_5.py
	(convert_utf8): don't change \inputencoding anymore
	(revert_utf8): new, revert encoding if possible

	* development/FORMAT: describe format 249


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14684 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-15 07:08:58 +00:00
José Matox
575ae4a8d7 Debris from earlier typo fix in file name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14683 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-14 21:54:42 +00:00
José Matox
a1564186de rename generate_enconding_info.py to generate_encoding_info.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14673 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-14 15:11:57 +00:00
José Matox
ff7f289358 Add language attribute to default file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14598 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-09 22:18:27 +00:00
José Matox
d401ee07c8 Add encoding to a default file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14594 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-09 21:56:12 +00:00
Jean-Marc Lasgouttes
0be91e7205 * lib/Makefile.am (dist_pkgdata_DATA): remove configure.py
(dist_pkgdata_PYTHON): and put it here
	(dist_scripts_DATA): rename to dist_scripts_PYTHON; this invokes
	automake's built-in python support.
	(install-data-hook): adapt to above change.

	* lib/lyx2lyx/Makefile.am (dist_lyx2lyx_DATA): rename to dist_lyx2lyx_PYTHON;
	this invokes automake's built-in python support.
	(install-data-hook): new target: sets executable bit on lyx2lyx.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14592 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-09 20:51:55 +00:00
José Matox
a9f2042082 Update Makefile.am with new and renamed files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14568 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-08 11:21:24 +00:00
José Matox
6785e442cf Add support for input encoding handling by lyx2lyx.
Support all lyx files (support goes to lyx-0.6 the first public available lyx version).

Fine tune the guessing of the lyx version used to produce the document (only useful for 2.10 and 2.15 documents).

Support to convertion to utf-8 encoding was added but it is not (yet) active.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14558 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-07 14:10:41 +00:00
José Matox
9e832550ad generate_enconding_info.py parses lib/languages and generates lyx2lyx_lang.py
as a python dictionary, ready to be used by other python modules.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14557 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-07 14:05:07 +00:00
José Matox
de0c8aef7c Give to get value a default argument,
if the value is not found the default value is returned.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14556 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-07 13:59:01 +00:00
José Matox
7f552526fc string.join(lst) -> " ".join(lst) and not "".join(lst)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14538 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-02 16:13:01 +00:00
José Matox
26c0f379c7 Remove calls to deprecated module string.
The calls are now made to string methods, the advantage being that they work with
unicode strings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14537 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-02 15:45:44 +00:00
José Matox
552a471c99 Start to consolidate the functions in parser tools.
Add a unit testing for parser tools functions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14536 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-02 14:25:43 +00:00
José Matox
b00206e882 Small fixes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14535 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-02 14:23:45 +00:00
José Matox
695bfd88ed Convert all python files to utf-8.
Add a documentation string to each module.

Add a documentation string to every function in the modules.

file is a python reserved word => s/file/document/g as variable

add a new property to modules, supported_versions that holds
 the versions supported by that module

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14534 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-02 14:19:22 +00:00
José Matox
2987ccdd9e lyx2lyx: Remove -tt from header since it does not work.
Changed the enconding to utf-8.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14533 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-02 09:54:41 +00:00
José Matox
088bcef87b lyx_0_08.py:
lyx_0_10.py
LyX.py: add support for UserGuide convertion from lyx-0.8 (and 0.7).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14532 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-01 22:54:57 +00:00
José Matox
958eead216 Add module documentation to lyx_0_10.py
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14531 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-01 14:38:13 +00:00
José Matox
ddc31f7aee Rename files:
lyx_1_1_6.py		-> lyx_1_1_6_0.py
	lyx_1_1_6fix3.py	-> lyx_1_1_6_3.py

Change LyX.py accordingly.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14530 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-01 08:38:24 +00:00
José Matox
8fc2c1dd05 * LyX.py
* lyx_1_1_5.py
	* lyx_1_2.py
	* lyx_1_3.py
	* lyx_1_4.py
	* lyx_1_5.py

	* parser_tools.py: remove functions that are not generic, i.e.
assume a specific pattern for the file format, and move them to the
places where they are used.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14503 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-27 18:30:13 +00:00
José Matox
857eb02a5c parser_tools.py (del_token): rename arguments to be coherent with other functions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14499 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-27 11:37:26 +00:00
Bo Peng
2ae2c0db71 Remove hardcoded option -tt from python scripts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14478 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-17 19:41:32 +00:00
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