Commit Graph

917 Commits

Author SHA1 Message Date
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
Richard Heck
fbd0436847 Begin a bunch of comments on the parser tools. You can look through the
file, but it is more helpful to have them summarized here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36121 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:18:20 +00:00
Richard Heck
665c9d78d5 Add two new routines to parser_tools. Somewhere along the way, I wished
I had these. I'm not going to go back and change more code, but these
will be worth having later.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36120 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 16:04:17 +00:00
Richard Heck
cd544b25d3 Remove FIXME.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36119 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:48:45 +00:00
Richard Heck
d13394a73b Rename and restructure get_containing_inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36117 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:18:47 +00:00
Richard Heck
5fe584cc9c Simplify this complicated routine of mine now.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36116 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:13:42 +00:00
Richard Heck
462c3c39bb Use get_quoted_value.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36114 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:11:46 +00:00
Richard Heck
0e9a0224c1 New routine: get_quoted_value.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36113 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:11:37 +00:00
Richard Heck
23499e63ba Move get_value_string to lyx_1_6, since it is only used there. A more
suitable replacement is forthcoming.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36112 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:07:32 +00:00
Richard Heck
f477341474 Use str2bool.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36111 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 15:01:42 +00:00
Richard Heck
68ef5f207c Improve the add_to_preamble routine. Now we really check all the lines.
This is crucial, because people often do put the same sort of comment as
the first line.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:59:11 +00:00
Richard Heck
2878afa5a7 Minor fixups for revert_splitindex.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36109 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:58:32 +00:00
Richard Heck
3202c8a9f3 I forgot that the single line case is really OK.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36108 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:50:27 +00:00
Richard Heck
fb46e00fd5 Reminders.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36107 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:48:45 +00:00
Richard Heck
183a53897a Clean up revert_xetex. So that wasn't the last one.
Minor changes after this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:44:19 +00:00
Richard Heck
1a1f6090b1 Fix up convert_bibtex_clearpage. The last one!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:39:58 +00:00
Richard Heck
645f3f20b3 New str2bool() utility. Python's own bool() returns True for any but an
empty string....


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36104 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:27:30 +00:00
Richard Heck
cd99f162b3 Simplify the get_value routines a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36103 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 14:26:14 +00:00
Richard Heck
859468234f Comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36100 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 01:24:38 +00:00
Richard Heck
6628aec30c This routine simply does not do what it claims to do in the comment. And
I cannot see why one would want to do what it actually does. The way it
is used in the code assumes it behaves as it now does, so far as I can
see. In particular, if we find:
	option "some string"
with the call:
	get_value(document.body, "option", i)
then this will return '"some'.

Someone please tell me if I am wrong.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36099 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 01:20:50 +00:00
Richard Heck
21bad53704 Simplify revert_diagram routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36098 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 01:06:08 +00:00
Richard Heck
f86f875a8c Fix up revert_rule routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36097 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 01:03:46 +00:00
Richard Heck
e0227fa396 Make sure we don't go beyond the end of the lines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36096 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 01:03:30 +00:00
Richard Heck
7529918b08 Re-write convert_rule. Existing version failed in several cases.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36095 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-05 00:55:52 +00:00
Richard Heck
91e9125060 Fix mchem routine: Typo.
Fix dots routine: Get value, then delete.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36094 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 21:47:47 +00:00
Richard Heck
ddf9ed7608 Minor structural improvement.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36093 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 21:42:24 +00:00
Richard Heck
27f4623b57 Typos? Thinkos?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36092 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 21:40:01 +00:00
Richard Heck
0a7e9018e5 Fix up the revert_mathdots routine. I think this is right, but I could
not really follow the logic of the original routine and don't know why
we would load mathdots for \ddots when we do not load it in 2.0 for the
same command.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36091 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 21:38:32 +00:00
Richard Heck
586b5685f5 Improve hex2ratio.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36090 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 21:32:11 +00:00
Richard Heck
2d7bbab89f Fix revert_align_decimal routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36089 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 20:54:58 +00:00
Richard Heck
438fc55e2c Simplify convert_mathdots.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36088 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 19:42:03 +00:00
Richard Heck
16be7a8b26 Forgot to svn add these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36087 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 19:07:30 +00:00
Richard Heck
d3fc1c21d1 Make revert_flexnames more pythonic.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36086 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:48:53 +00:00
Richard Heck
883520c197 Make this routine more pythonic.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36085 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:42:47 +00:00
Richard Heck
0db238a371 Factor out some common code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36084 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:39:36 +00:00
Richard Heck
58fa331b8b Improve the nameref reversion routine. We don't need Nameref anymore,
since that was removed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36083 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:31:24 +00:00
Richard Heck
e97c5ba9da Minor improvements to prettyref routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36082 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:19:19 +00:00
Richard Heck
dd0a135588 Minor cleanup for IEEETran reversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36081 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:16:23 +00:00
Richard Heck
ac0ee09a23 Fix up convert_makebox routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36080 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:13:44 +00:00
Richard Heck
9d5b41e8fc Fix up revert_makebox routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36079 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 17:08:35 +00:00
Richard Heck
66808bbe7a Hmm.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36078 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:36:46 +00:00
Richard Heck
223ad57d32 Whoops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36077 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:31:18 +00:00
Richard Heck
7d58b1cdf0 These routines are no longer used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36076 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:30:17 +00:00
Richard Heck
a81e1d8c95 I forgot to take this out in r35495.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36075 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:29:24 +00:00
Richard Heck
17175159c7 Little things in some of my routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36074 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:25:26 +00:00
Richard Heck
2778d96bd2 Another mistake of mine, though it in fact had no effect.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36073 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:20:30 +00:00
Richard Heck
5e6173b7e2 Simplify and pythonize.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36072 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:15:46 +00:00
Richard Heck
890b4b419a Shaded boxes reversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36071 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:14:17 +00:00
Richard Heck
fecc3b8305 Fix up fontcolor reversion, and also fix a problem with the note color
reversion.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36070 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:09:35 +00:00
Richard Heck
2287446d04 Minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36069 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:01:47 +00:00
Richard Heck
b04159cf21 My thinko, this time.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36068 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 16:00:33 +00:00
Richard Heck
540802f717 Move generally useful routines out of lyx_2_0.py and into modules. We
keep copying these from one file to another each new release.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36067 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:59:38 +00:00
Richard Heck
f4190c9e23 Update header.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36066 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:45:51 +00:00
Richard Heck
5e4493d97b Move generally useful parser routines to parser_tools.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36065 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:44:32 +00:00
Richard Heck
5d0a284ea9 Clean up remove_option routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36064 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:42:28 +00:00
Richard Heck
3fae2dee95 Clean up greyed out notes reversion.
Also, fix up the insert_to_preamble routine.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36063 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:39:32 +00:00
Richard Heck
f9f0c57da2 OK, so that version of revert_inset_preview wasn't so good. Restore the
complicated code, but note its issues.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36061 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:33:19 +00:00
Richard Heck
49a2a04963 Minor fixups to xymatrix reversion routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36060 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 15:05:42 +00:00
Richard Heck
69cd79b7e7 Clean up revert_inset_preview, and disable some of the more complex
code. As noted in the comment, it does not work as intended.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36059 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 14:53:55 +00:00
Richard Heck
adedac675b Fix earlier mistake.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36057 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 14:23:47 +00:00
Richard Heck
2ad71f22ce Fix multirow reversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36056 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 14:20:10 +00:00
Richard Heck
4091078fb4 Add warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36055 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 14:00:56 +00:00
Richard Heck
3215a451dd Fix revert_mhchem routine.
Please remember that find_token only looks at the beginning of the line!


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36054 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:56:46 +00:00
Richard Heck
bbacb7c5be Simplify revert_suppress_date.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36051 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:43:33 +00:00
Richard Heck
1bc5f3cb2b Clean up author id reversion routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36050 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:42:19 +00:00
Richard Heck
e49676094d Clean up author id conversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36049 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:34:56 +00:00
Richard Heck
4f04086c97 Fix up revert_hspace_glue_lengths.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36048 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:22:00 +00:00
Richard Heck
04157a2820 Remove comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36047 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:06:16 +00:00
Richard Heck
fd62002d1b Let latex_length return a tuple. Saves splitting, etc.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36046 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 13:05:19 +00:00
Richard Heck
5d6f9b620d Fix up hspace reversion routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36045 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:59:44 +00:00
Richard Heck
53f88eea18 Simplify vspace reversion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36044 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:51:57 +00:00
Richard Heck
d423df4366 Forgot these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36043 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:47:18 +00:00
Richard Heck
fbfdef21f1 Reduce indentation. Also, it is probably not a good idea to use "string"
as a variable name here.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36042 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:46:38 +00:00
Richard Heck
dcc164407a Slightly simplify revert_percent_skip_lengths.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36041 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:43:19 +00:00
Richard Heck
4a1558855c Simplify revert_paragraph_indentation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36040 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:38:56 +00:00
Richard Heck
bd11f5a78c Fix up revert_longtable_align routine. Also, fix a couple thinkos in an
earlier tabular routine.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36039 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:32:09 +00:00
Richard Heck
c2a9361960 Slight simplification.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36037 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:24:33 +00:00
Richard Heck
248bd19a72 Add warning, save cycles.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36036 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:23:36 +00:00
Richard Heck
18a30566cb Save a few cycles.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36035 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:20:55 +00:00
Richard Heck
155b339d84 Don't return yet! We need to check the other one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36034 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:20:03 +00:00
Richard Heck
3ac94820db Comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36033 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:19:14 +00:00
Richard Heck
03efa930c6 Remove unnecessary argument.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36032 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:15:49 +00:00
Richard Heck
a678ee4bdf Renaming.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36031 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 12:11:26 +00:00
Richard Heck
b98dcee860 Minor cleanup for additional index reversion routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36027 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 01:07:42 +00:00
Richard Heck
3bb4bbd8b8 Clean up split index reversion routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36026 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-04 01:04:39 +00:00
Richard Heck
ab80a57edd One more minor thing....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36025 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 23:35:40 +00:00
Richard Heck
ce7c1afc34 Simplify revert_backgroundcolor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36024 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 23:34:45 +00:00
Richard Heck
dfad3972db Clean up other phantom reversions, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36023 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 23:14:32 +00:00
Richard Heck
e3a577ba15 Clean up the revert_phantom routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36022 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 23:11:01 +00:00
Richard Heck
838adc69aa Try to fix revert_tabularvalign.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36021 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:53:15 +00:00
Richard Heck
40ad4b4d63 Just a restructuring, with early continue.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36020 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:22:00 +00:00
Richard Heck
7dad1e1c5d Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36019 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:19:09 +00:00
Richard Heck
c5fb71f2c1 Fix comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36018 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:18:17 +00:00
Richard Heck
488a07752f Simplify a bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36017 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:16:01 +00:00
Richard Heck
5a83d1444f Comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36016 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:14:36 +00:00
Richard Heck
04024c1265 Clarify convert_rule routine. A bit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36015 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:06:43 +00:00
Richard Heck
b6a6520118 Clean up revert_rule routine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36014 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-03 22:01:30 +00:00
Richard Heck
48ffa78c9a Fix another thinko of mine.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36000 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:37:53 +00:00
Richard Heck
580a984e2c Fix lyx2lyx problem related to bug #1881.
It is dangerous (i.e., foolish) to rely upon assumptions about exactly
how many lines there will be between one structure and another structure
in a LyX file. No such things should be hardcoded into lyx2lyx. You must
ALWAYS search for what you want, e.g., the beginning of the layout in 
which some particular inset is contained. 



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35998 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:24:49 +00:00
Richard Heck
4d2b6ffc78 Fix another infinite loop.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35997 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 15:22:16 +00:00
Richard Heck
d7c31dfff3 Prevent infinite loop.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35996 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 14:55:33 +00:00
Richard Heck
e37525b0ba Fix typo/thinko here. It's the match result we want to check, of course.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35994 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-02 14:47:28 +00:00
Uwe Stöhr
76a76635aa lyx_2_0.py: correct comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35935 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 19:11:46 +00:00
Uwe Stöhr
e7f16c2a3b lyx2lyx/lyx_2_0.py: remove another unused debug warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35644 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-14 01:36:15 +00:00
Richard Heck
01013c0785 Refstyle support. The user can now choose between prettyref and restyle
for formatted references. Fixes #2295, in so far as it makes it possible
to translate formatted references.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35623 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 12:36:53 +00:00
Uwe Stöhr
cde054cc6b lyx_2_0.py: remove a debug warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35619 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-13 02:29:00 +00:00
Richard Heck
d4634167cc Get rid of "CharStyle:", "Custom:", and "Element:" prefixes, per a
suggestion of JMarc's. Docs to follow.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35608 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-12 14:46:17 +00:00
Uwe Stöhr
e8a1fed47c InsetBibtex.cpp:
- fix #1881, fileformat change
- fix #6470

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35590 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-11 01:05:20 +00:00
Richard Heck
7192937ab5 Revert the beamer changes from a while ago. They work with some documents,
but not with all. There's a general problem here that will take more work.
I've got most of it licked, but the lyx2lyx issue is difficult. 



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35495 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-24 22:34:52 +00:00
Uwe Stöhr
4580296b8f lyx2lyx/lyx_2_0.py:
- fix mathdots conversion routine
- fix typo in feyn reversion routine

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35462 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-20 02:24:03 +00:00
Uwe Stöhr
1787e837e7 lyx2lyx/lyx_2_0.py: fix bug in the feyn reversion routine
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35461 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-20 01:55:34 +00:00
Pavel Sanda
65962da47b Add support for feyn package and Diagram inset.
Patch from Ronen Abravanel.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg161952.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35455 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-19 22:12:06 +00:00
Richard Heck
d11ef5b5f6 Typos.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35424 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-17 12:26:55 +00:00
Uwe Stöhr
0e7ab29f49 InsetLine: support for the LaTeX command \rule; kick out the hardcoded \lyxline; fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35299 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-07 00:41:00 +00:00