Commit Graph

1020 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
dc88d0b2a5 Small fixup after 4eb3ed96
This is a line that should not have been backported from 2.2.x.
2016-09-08 16:49:31 +02:00
Richard Heck
7497435a01 Forgot to add this file. 2016-06-03 17:44:11 -04:00
Richard Heck
eea79253d7 Fix default version of lyx2lyx. Thanks Georg. 2016-06-01 16:27:07 -04:00
Richard Heck
4eb3ed96e5 Update lyx2lyx from 2.2.0. This is in preparation for the 2.1.5 release. 2016-06-01 12:32:22 -04:00
José Matos
5ed74b4446 Make lyx2lyx parser a bit more robust.
Ignore if the first line of a lyx file does not start with a #
Add such a line if it is missing..

Fixes bug #9279
2015-03-31 15:29:41 +01:00
Juergen Spitzmueller
d98618c7db Fix thinko in convert_corollary_args
Fixes: #9478
2015-03-25 09:21:42 +01:00
Juergen Spitzmueller
5a21d3f0f8 Fix reversion of beamer description overlay args 2015-02-13 18:34:35 +01:00
Juergen Spitzmueller
e52b85d267 Fix bug in get_containing_inset and get_containing_layout
We have to check if this is really a parent (or just the first inset/layout we have).
2015-02-13 16:28:00 +01:00
Juergen Spitzmueller
8b17b25764 Fix conversion of beamer block arguments where the overlay argument and the closing title argument bracket share the same ERT
Fixes: #9411
2015-02-13 16:24:00 +01:00
Juergen Spitzmueller
e85eb8b833 Fix conversion of frame ends when frame is nested in inset
Fixes: #9409
2015-02-13 16:21:00 +01:00
Juergen Spitzmueller
821c09668a Honor paragraph parameters when converting chunk layouts.
Fixes: #9320.
2014-12-01 15:05:52 +01:00
Jean-Marc Lasgouttes
3040adf765 Fix reverting of chunks insets to 2.0 format
When the chunk inset did not have an optional argument, the prefix of the chunk was omitted.

Fixes bug: #9343
2014-12-01 10:38:10 +01:00
Juergen Spitzmueller
560a421e58 Fix and simplify par params parsing in get_containing_layout.
The previous version did not catch \align <alignment>.
2014-11-30 09:40:45 +01:00
Juergen Spitzmueller
42c51e7169 Fix conversion of beamer block titles when the language is switched at the beginning of the title 2014-11-25 19:18:22 +01:00
Richard Heck
8f40d784c0 Fix bug 9300. We need manually to convert newlines to paragraph breaks. 2014-11-04 09:54:45 -05:00
Juergen Spitzmueller
6f3fbc9cd3 lyx2lyx: fix convert_chunks for empty chunk layouts
Fixes: #9298
2014-11-03 16:46:20 +01:00
Juergen Spitzmueller
959ad0b250 Fix some convert_TeX_brace_to_Argument glitches
Fixes: #9273
2014-09-27 09:37:54 +02:00
Juergen Spitzmueller
063e5242bf Fix lyx2lyx issue with complex beamer arguments.
Fixes: #9254
2014-09-27 09:31:45 +02:00
Juergen Spitzmueller
03d6040904 Do not break documents with complex beamer block ERT usage we cannot handle
Fixes: #9144
2014-08-03 17:38:46 +02:00
Juergen Spitzmueller
c31cb9fd98 Improve parsing of ERT arguments in beamer block titles.
Fixes: #9225
2014-08-01 16:06:42 +02:00
Juergen Spitzmueller
edddfb99fc Fix beamer block conversion when arguments are in multiple ERTS.
Fixes second part of #9208.
2014-07-27 18:06:08 +02:00
Juergen Spitzmueller
a8ba869d73 Add beamer-resenumerate (from our wiki) to the list of safe modules for argument conversion, since it is safe.
Fixes part of #9208.
2014-07-27 18:02:35 +02:00
Georg Baum
275c6dabe6 Fix bug #9162: Missing \use_indices
The lyx2lyx conversion for format 352 was incomplete: It should have been
added the \use_indices setting, but it relied on the fact that the default in
LyX for missing \use_indices is the same as the old format without that
setting used. However, the default might change in the future, and later
lyx2lyx conversions rely on that setting as well.
2014-07-09 20:58:44 +02:00
Richard Heck
0f3746400e Copy over changes to lyx2lyx made in master. Unfortunately, some of
these got committed to stable and some did not, and now it is all but
impossible (I've tried) to do this by cherry-picking.
2014-05-29 18:17:08 -04:00
Enrico Forestieri
94ed54b51a Fix reversion of box insets.
(cherry picked from commit da75d31948)
2014-05-29 18:06:50 -04:00
Georg Baum
76417c7326 Do not corrupt documents without newline at EOF
trim_eol() assumes that a line always ends either with \n, \r, or \r\n.
This assumption is always valid except for the last line of a document, since it
may miss the trailing newline. LyX does not create such documents, bu they may
result from automatic creation tools, and LyX can read them, so lyx2lyx should
be able to read them as well.
(cherry picked from commit c75c6e446a)

Fix the fix

MAC-style (pre-OS X) line ends were not recognized anymore
(cherry picked from commit 55af9cb006)
2014-05-29 11:28:04 -04:00
Enrico Forestieri
b851a60376 Avoid processing multiple times the same paragraph when converting latex arguments.
(cherry picked from commit 0080201977)
2014-05-29 11:24:53 -04:00
Enrico Forestieri
20214ee224 Fix an off-by-one error in the reversion of beamer documents.
(cherry picked from commit dbd4d781dc)
2014-05-29 11:24:41 -04:00
Juergen Spitzmueller
ad723c41b6 Fix nesting in some beamer reversion methods.
Patch by Enrico
2014-05-21 15:44:30 +02:00
Juergen Spitzmueller
02410adbfe Fix reversion of beamer overprint when a nested paragraph has an argument 2014-05-21 15:42:03 +02:00
Richard Heck
ccd8cd89ad Add limits to searches in convert_TeX_brace_to_Argument.
(cherry picked from commit eb26d85dc9)
2014-05-18 11:26:34 -04:00
Juergen Spitzmueller
ede754039d Beamer block conversion: consider ERT arguments with leading/trailing blanks
Should also go to branch.
2014-05-08 19:52:01 +02:00
Georg Baum
b0664e0c98 Fix table rotate conversion to 2.0 format
The old code did create invalid documents, since the space between the rotate
flag dn the previous flag was removed.
2014-05-01 13:48:44 +02:00
Georg Baum
b73a59932e Fix lyx2lyx math package defaults (bug #9069)
lyx2lyx sets all new math packages to off when converting from old formats.
This is correct if any command which would cause an automatic package loading
exists in the document. However, it is wrong if no command exists: This leads
to problems if later a command is added (bug #9069), which is especially
annoying for templates.
The fix consists of two parts:
1) convert_use_package() considers now the used commands like
   revert_use_package(), and uses them to decide whether to set the package to
   auto or off.
2) convert_undertilde() and revert_undertilde() use a slightly adjusted copy of
   convert_use_package() and revert_use_package(), so that the bug is also
   fixed for undertilde. We cannot use the latter functions directly, because
   of "\usepackage undertilde" vs. "\use_undertilde".
2014-04-27 18:09:29 +02:00
Georg Baum
d47a556b46 Fix math package conversion to 2.0 format
When doing the lyx2lyx round trip of the 2.0.8 user guide from format
413 -> 474 -> 413 you get an invalid document, because the math packages
mhchem and undertilde are incorrectly converted.
It turned out that the old reversion code did only work for particular
package oderings. The new one works for abitrary sorted packages.
2014-04-27 18:08:24 +02:00
Georg Baum
28bde98d76 Fix data loss in user guide conversion to 2.0.x
When doing the lyx2lyx round trip of the 2.0.8 user guide from format
413 -> 474 -> 413 you do not get a zero diff. The most important problem is
caused by the conversion of the argument insets to the old syntax: This
conversion adds an additional empty line (harmless), and it destroys the
document structure if the first inset in e.g. a subsection is not an argument
inset, but e.g. an index or label inset.
The fix is quite easy: Ensure that the paragraph begin is set to the first
argument inset.
2014-04-27 18:06:34 +02:00
Georg Baum
e754d00faa Fix warning in lyx2lyx 2.0<->2.1 round trip
revert_justification() issues a warning if the \justification parameter does
not exist, and LyX itself always writes it unconditionally as well, so add it
also in lyx2lyx when converting old documents.
Currently this does not have any user visible effect, but it decouples the
default value of BufferParams::justification from the conversion of old
documents: Now it is possible to set the default to false in LyX, and old
documents will still be converted correctly.
2014-04-27 18:05:22 +02:00
Juergen Spitzmueller
8b7d5276b8 Fix conversion of beamer block titles that end with a non-ERT inset. 2014-04-27 09:44:43 +02:00
Richard Heck
b5c2cba0b3 Fix problem with verbatim reversion. 2014-04-11 14:49:41 -04:00
Vincent van Ravesteijn
84827c8705 lyx2lyx: Set last minor version of the 2.0.x series 2014-03-23 17:48:07 +01:00
Vincent van Ravesteijn
6eba310ef7 lyx2lyx: Set conversion table for LyX 2.1 2014-03-23 17:48:06 +01:00
Vincent van Ravesteijn
5d15807954 lyx2lyx: Fix conversion table for LyX 2.0 2014-03-23 17:48:02 +01:00
Georg Baum
8f1cbe000e Fix bug #4036 (lyx2lyx produces invalid LyX 1.4.x)
I should have had a closer look much earlier, since the fix is simple and
safe, but at that time I did not notice. The problem was that an invalid
.lyx document was created when converting unicode characters with two
backslashes in their LaTeX definition from lib/unicodesymbols to pre-unicode
LyX format.
2014-02-19 21:56:00 +01:00
Richard Heck
0ded71a480 Fix silly mistake spotted by Jurgen.
Give k a more descriptive name.
Prettify a bit of the code.
2014-02-07 10:36:55 -05:00
Juergen Spitzmueller
9d6c2bf407 Fix lyx2lyx chunk conversion (bugs #8877, #8876) 2014-02-06 10:11:02 +01:00
Richard Heck
1f231c9538 Typo. 2014-01-31 09:38:00 -05:00
Juergen Spitzmueller
a7a585c7bd beamer conversion: deal with more complicated block titles 2014-01-24 09:24:12 +01:00
Juergen Spitzmueller
50066b46ab Improve beamer conversion: Support default list overlay specification without ERT 2013-12-13 14:55:34 +01:00
Juergen Spitzmueller
0aaf2f2008 Improve beamer frame conversion: frame arguments that use multiple ERTs (one ERT inset per argument) are converted 2013-12-06 11:57:33 +01:00
Juergen Spitzmueller
ac7f7dbdce Factor out identical frame argument conversion 2013-12-06 10:53:49 +01:00