anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,087 Commits 31 Branches 172 Tags 619 MiB
8088770d32
Commit Graph

813 Commits

Author SHA1 Message Date
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