Commit Graph

347 Commits

Author SHA1 Message Date
Uwe Stöhr
643780f4e4 lyx2lyx/lyx_1_6.py: small tweak
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20553 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-27 22:52:37 +00:00
Richard Heck
0787ade6c0 This is the first part of a cleanup of how we handle the InsetCommand hierarchy. This part starts to disentangle the type of the inset from the command that a single instance of the inset represents. This involves two sorts of changes:
(i) The file format is changed, so that command insets are represented as:
    \begin_inset CommandInset insetype
    LatexCommand command
    ...
    \end_inset
This involves some lyx2lyx and changes to the readInset() routine in factory.cpp
(ii) The InsetCommand and InsetCommandParams classes also have to be changed, as the command name was used in these classes for various purposes for which the inset type ought really to be used.
Further clean-up to come.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20544 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-27 18:24:18 +00:00
Uwe Stöhr
c5372ca60e lyx2lyx/lyx_1_6.py: add conversion routine I forgot in r20462
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20466 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 14:37:10 +00:00
Uwe Stöhr
3ab8eef56a lyx2lyx/lyx_1_4.py: fix typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20463 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 13:46:40 +00:00
Uwe Stöhr
b7d0510502 Fileformat increased to 287: support for optional arguments of package wrapfig that is used for wrap floats
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20462 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 13:43:58 +00:00
Uwe Stöhr
011459ce46 - increase fileformat to 286: this has been forgotten in Pavel's PDF-support patch
(besides this, note that the fileformat change to 285 is not yet documented in FORMAT)

- lyx2lyx/lyx_1_6.py: fix routine to revert the PDF-support stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20448 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-23 12:39:31 +00:00
Richard Heck
a1a395d4e7 Missing things in lyx2lyx from PDFOptions commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20393 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 22:57:23 +00:00
André Pönitz
21f0dd25f1 Pavel Sanda's "PDFOptions" patch, part II
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20390 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 22:32:20 +00:00
José Matox
1a221943db Fix handling of cjk_encoding for documents made with versions older than 1.5
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20380 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-20 16:12:47 +00:00
Bo Peng
93196b1f73 Embedding: add a check box to InsetGraphic and show/change embedding status
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20297 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-15 18:31:32 +00:00
José Matox
dbe7b13f65 lyx2lyx: use parseopt instead of getopt (the documentation of options
is kept in sync with its usage)

LyX.py:  make source more readable, place whitespaces, break long
         lines, add documentation strings, etc.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20279 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-14 14:37:14 +00:00
Bo Peng
e2d5893eab Embedding: move manifest to .lyx file, as a separate section between header and body
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20212 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 14:23:12 +00:00
Uwe Stöhr
17112f655d Helge's wrapfig patch:
- Format incremented to 284
- LaTeX-package wrapfig is now used instead of flotflt for wrap floats (this allows us to implement now also a table wrap float)

(the optional overhang argument of wrapfig will be implemented later)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20185 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 23:47:22 +00:00
Uwe Stöhr
ff9143b226 LyX.py: fix for previous commit
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20175 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 18:37:50 +00:00
Uwe Stöhr
350dad6f65 doc_toc.py: remove non-ascii character since LyX.py can't encode it at the moment
LyX.py: fix thinko that lead to out of range list

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20173 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 17:02:48 +00:00
Martin Vermeer
2e5355e4c2 Convert CharStyle to Flex also in file format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20138 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-08 13:01:29 +00:00
José Matox
b3d5000a64 Increment file format due to the embedded feature
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19938 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 09:46:14 +00:00
Richard Heck
8a947f63da This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.

This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.

The GUI will come next.

Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
José Matox
f6e94c8b24 Fix bug 4158.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19886 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 13:39:15 +00:00
Alfredo Braunstein
b100b0a4c4 fix tabulation bug (python is amazing)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19646 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-19 14:03:51 +00:00
Martin Vermeer
3c504502bf Further inset configurability, moving charstyle stuff to collapsable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19640 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-18 23:26:07 +00:00
Martin Vermeer
ff682ec3e4 partial merge of charstyle and insetlayout stuff, part 2 (lyx2lyx)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19622 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-17 15:48:41 +00:00
José Matox
f130c13c7b Increase the file format, now every \\begin_deeper has a corresponding \\end_deeper.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19461 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-12 14:56:49 +00:00
José Matox
ca81b43f03 Fix bug 518 (thanks to Jean Marc and Martin for the help)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19455 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-12 13:25:36 +00:00
José Matox
a8dcedb3b1 Prepare for lyx 1.4.5
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19182 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-24 14:29:21 +00:00
José Matox
155058a362 Another take at bug 4049
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19172 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-23 17:06:32 +00:00
José Matox
61cb6824a6 Second part of bug 4050 fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19168 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-22 20:10:28 +00:00
José Matox
972ec40b73 Fix problem reported by bug 4050 (I am not sure if this fixes the bug)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19167 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-22 19:03:11 +00:00
José Matox
b03bc96912 Fix bug 2049
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19166 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-22 18:20:22 +00:00
Bo Peng
cce9cfc975 fix wrong fix r19160. I did not have an extra \end_layout, but missed a \begin_layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19163 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-21 05:45:50 +00:00
Bo Peng
f668844789 Remove an extra \end_layout from revert_listings_inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19160 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-20 19:02:52 +00:00
José Matox
ce87f9dd49 (Atempt to) Fix bug 4048
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19159 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-20 16:02:24 +00:00
José Matox
6dfd1c17f3 Prepare code for refactorisation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19158 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-20 15:06:48 +00:00
José Matox
d3f7996cdd Move related code together (no code added or deleted)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19157 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-20 14:25:04 +00:00
Jürgen Spitzmüller
586a07709f * lib/lyx2lyx/lyx_1_5.py (revert_unicode):
- reintroduce \n's accidentally removed in revision 19145
	  (fixes bug 4046)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19153 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-20 10:26:01 +00:00
Dov Feldstern
11441c8560 Fix a few edge-cases which in the lyx2lyx conversion to format 249
(multi-encoding -> utf8); specifically, the language was being          
incorrectly identified in certain insets, which of course led to
encoding problems.
This fixes part of bug 3613 (http://bugzilla.lyx.org/show_bug.cgi?id=3613).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19151 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-20 02:10:28 +00:00
José Matox
aa5848f957 Clean and speedup code in revert_unicode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19145 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-19 17:15:31 +00:00
Jürgen Spitzmüller
f36e1b4b31 * lib/lyx2lyx/lyx_1_5.py (revert_unicode): fixes by Georg Baum (bug 3985)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19138 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-19 14:59:43 +00:00
José Matox
b3059e2070 Fix bug 4033 (Georg)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19137 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-19 12:24:01 +00:00
Jürgen Spitzmüller
e12b2d31ed * lib/lyx2lyx/lyx_1_5.py:
- use document.default_layout instead of hardcoded "Standard" layout (bug 4035)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19135 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-19 10:33:40 +00:00
José Matox
74f45fc0e9 Fix bug 3404 (from Bo Peng)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19114 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-18 10:49:33 +00:00
José Matox
8397a051fa Improve revert unicode (bug 3958) from Anders Ekberg
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19113 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-18 10:47:44 +00:00
José Matox
aafefdbe26 Fix crash loading old files (http://www.mail-archive.com/lyx-users%40lists.lyx.org/msg57472.html)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-17 16:46:19 +00:00
José Matox
95cf1d65f3 Old lyx files (from 1.0 era) can start with a begin deeper
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-17 11:53:46 +00:00
José Matox
e983dba010 Add frenchb to languages for compatibility with older files.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19044 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-11 15:10:13 +00:00
Uwe Stöhr
d4fb110865 lyx_1_5.py: fix typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18995 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-06 00:30:29 +00:00
Jürgen Spitzmüller
7562340249 fix unicode decomposition (bugs 3313 and 3498):
* src/support/docstring.{cpp,h}:
	- rename normalize_kc to normalize_c and use normalization form C (instead of KC)

* src/callback.cpp:
* src/Trans.cpp:
* src/frontends/qt4/GuiClipboard.cpp:
* src/frontends/qt4/GuiSelection.cpp:
* lib/lyx2lyx/lyx_1_5.py:
	- use normalization forms C and D instead of KC and KD.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18991 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-05 14:45:00 +00:00
Jürgen Spitzmüller
768addedfd * lib/lyx2lyx/lyx_1_5.py (revert_unicode): fix typo in comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18950 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-30 06:56:15 +00:00
Jürgen Spitzmüller
2bde238feb * lib/lyx2lyx/lyx_1_5.py:
- fix convert_graphics_rotation and make revert_graphics_rotation actually work.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18948 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-30 06:07:20 +00:00
Uwe Stöhr
0b3c217b79 lyx_1_5.py: last part of fix for bug 3313
OK from José: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg121628.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18918 a592a061-630c-0410-9148-cb99ea01b6c8
2007-06-27 20:46:04 +00:00