Commit Graph

830 Commits

Author SHA1 Message Date
Richard Heck
74245321ca Change the passthru conversion routine again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37833 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 21:46:47 +00:00
Richard Heck
6127141d4b Introduce BufferParam to control whether CSS is output in the header of
the XHTML file or to a separate style file.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37682 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-15 17:44:17 +00:00
Richard Heck
5b9b74572b Remove debugging code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37588 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 22:19:50 +00:00
Jürgen Spitzmüller
099394c230 * lyx_2_0.py: fix revert_xetex method.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37570 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-09 09:26:33 +00:00
Jürgen Spitzmüller
839213e389 fix lyx2lyx after r37471.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37477 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-04 07:35:12 +00:00
Edwin Leuven
119ea9cd24 support for tabular*
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37471 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 23:11:26 +00:00
Jürgen Spitzmüller
345a14ef09 d'oh!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37460 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 15:38:22 +00:00
Jürgen Spitzmüller
f27d5aa9ae * Allow to set language package on a per-document basis (fixes bug 2909).
File format change. Commit approved by Pavel on trac.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37457 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-03 14:17:31 +00:00
Richard Heck
5123774bd1 Fix lyx2lyx problem with sweave files and ParBreakIsNewline.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37353 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-28 19:48:03 +00:00
Pavel Sanda
1246a70abd Update years
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37284 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-21 13:24:23 +00:00
Richard Heck
06ee6bde14 Fix bug #7214 as best we can. The point here is that we only
want to add the \clearpage if the class has chapters.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37266 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-20 16:38:41 +00:00
Georg Baum
96bcf145d9 Fix conversion of nested box insets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37264 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-19 22:04:45 +00:00
Georg Baum
cff0f635cc fix endless loop
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36695 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-03 19:27:35 +00:00
Jürgen Spitzmüller
f1b586d445 * lyx2lyx/lyx_2_0.py:
- remove wrong warning (bug 7100).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36574 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 07:09:58 +00:00
Richard Heck
7f8b868f4a Fix bug #2607.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36520 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 17:21:17 +00:00
Richard Heck
d83c9f3fe3 Minor style.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36509 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 16:07:17 +00:00
Jürgen Spitzmüller
2dc2e4770b Implement GUI for LuaTeX. File format change due to the renaming of the \use_xetex buffer param.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36500 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-26 09:42:03 +00:00
Georg Baum
f3ad535dbd Fix conversion of 1.5.x documents that conflict with mchchem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36437 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-22 21:07:20 +00:00
Georg Baum
dea050cb93 fix bug 3008: Add subscript/superscript inset for text
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 17:00:12 +00:00
Richard Heck
05df2a7cc6 Fix python 3 deprecation warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36267 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-12 15:42:50 +00:00
Richard Heck
00e6cfee4a Same changes for revert_multirowOffset as for revert_multirow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36233 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 14:00:54 +00:00
Richard Heck
a1589fb091 Thinko.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36232 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 13:46:50 +00:00
Richard Heck
22c7c7b144 Another try at multirow reversion. What makes this so hard is that we
have to account for the possibility of tables within tables.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36230 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-10 13:41:43 +00:00
Uwe Stöhr
07176c1a45 lyx_2_0.py: correct reversion of multirows with offsets the same ways as for "standard" multirows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36221 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-09 05:35:51 +00:00
Uwe Stöhr
fd25c82378 lyx_2_0.py: correct reversion of multirows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36220 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-09 04:58:46 +00:00
Uwe Stöhr
86b99f8f32 GuiTabular: support for multirow offset; fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36182 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 05:32:28 +00:00
Richard Heck
0a7187b946 Remove one FIXME.
Remove "added by lyx2lyx"-type comment. This is now added automatically
by add_to_preamble (and insert_to_preamble, too).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36166 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 18:42:19 +00:00
Uwe Stöhr
613cad54a4 lyx_2_0.py:
- remove 2 fixmes; we can be sure that there is space between the table entries
- add comment for the preamble that got lost the last days

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36165 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 17:42:26 +00:00
Jean-Marc Lasgouttes
b9b619641b This patch implements proper ERT behaviour for normal layouts.
In particular, it makes paragraph breaks generate single \n in latex output
when ParbreakIsNewline is true

This means that it is not necessary anymore to use newlines to break lines. 
Plain paragraph breaks can be used instead, like is done now in ERT/Listings. 
This is mainly aimed at sweave support.

lyx2lyx support courtesy of Richard Heck



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36163 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 15:06:19 +00:00
Vincent van Ravesteijn
88f3be373a Readd the conversion/reversion for format 405.
This was accidentally removed in r36136.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36151 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-06 00:39:06 +00:00
Richard Heck
e3c3c18f27 A couple more comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36144 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:14:49 +00:00
Richard Heck
c0c780d719 Comment out some unused code to save a little load time. It also helps
readers of the class to know what's used and what's not.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36143 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:13:33 +00:00
Richard Heck
284346aa4e Whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36142 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 21:12:44 +00:00
Richard Heck
44279587e5 Make sure we delete this line.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36139 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:13:58 +00:00
Richard Heck
296ae1b3f0 Find the end of this layout, not the first end_layout tag we see!
Math manual now exports right.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36138 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:11:51 +00:00
Richard Heck
bae5fe21bc Make sure we extend with a list.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36137 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 20:11:19 +00:00
Richard Heck
6ec6e93815 Use find_token_exact so that we do not also find hspace*.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36136 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 19:59:24 +00:00
Richard Heck
c282f4e9db Remove use_makebox option from other boxes, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36135 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 19:51:06 +00:00
Vincent van Ravesteijn
f226c9d3fc Fix bug #6058: Change tracking and versioning.
Computes a hash value for the authors when using change tracking.

Text.cpp, BufferParams.h, Author.h:
  Change unsigned int to int because the hash values can be negative.

lyx2lyx:
  Allow to convert negative author_ids.

See also: r30756.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36134 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 18:25:29 +00:00
Richard Heck
fb64f0e1af Improve how add_to_preamble and insert_to_preamble work, and audit the
various calls to each.

This should more or less complete the lyx2lyx orgy. Some things probably
will have been broken by accident. Hopefully not too many, and more
things that were broken got fixed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36133 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:54:57 +00:00
Richard Heck
86cff08734 insert_to_preamble likes lists of lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36132 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:39:21 +00:00
Richard Heck
f3ae1e2641 These commands should just take some lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36131 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:35:53 +00:00
Richard Heck
68ec955a6d Some documentation for lyx2lyx_tools.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36130 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:27:28 +00:00
Richard Heck
cbbc3d34e3 So I now understand why find_token_exact is called what it is, but it
does not do what it is supposed to do, in general. Still, I guess it is
best left as it is.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36129 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:09:43 +00:00
Richard Heck
1702cc1fa2 At least rename this argument to something that makes sense.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36128 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 17:02:26 +00:00
Richard Heck
3f47eb1883 More documentation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36127 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:59:27 +00:00
Richard Heck
6cc1d31e38 Just a bit of safety here.
This 0 default for end is wrong. You should be able to do:
  find_token(lines, token, 0, 0)
and have that return -1. As it is, this is equivalent to:
  find_token(lines, token, 0, len(lines))
But I am afraid to change the default, in case something in lyx_1.2.py
relies upon it somehow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36125 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:43:30 +00:00
Richard Heck
f93c44791d Use del_token where it makes sense to do so.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36124 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:33:29 +00:00
Richard Heck
b1c11faf7e This is the del_token that would be helpful.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36123 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:22:26 +00:00
Richard Heck
98c80361f4 Move del_token into the files where it is used. We could use such a
thing, but not one that returns what this does.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36122 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:20:32 +00:00