anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,906 Commits 30 Branches 171 Tags 677 MiB
22c7c7b144
Commit Graph

230 Commits

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