Commit Graph

1168 Commits

Author SHA1 Message Date
Juergen Spitzmueller
77f5baec8f Fix thinko in revert_newgloss: only dissolve ERTs in glosses! 2015-12-27 18:20:49 +01:00
Juergen Spitzmueller
106d89f7e6 revert_tabularvalign: fix removal of tabularvalign feature tag 2015-12-27 17:34:01 +01:00
Juergen Spitzmueller
6b5d5666ac Fix thinko in revert_tabularvalign 2015-12-27 17:23:16 +01:00
Juergen Spitzmueller
a80da13cc1 Rewrite and split the moderncv conversion routine.
This fixes several conversion problems, amongst others the redundant
\end_layout reported by Kornel.
2015-12-27 12:48:11 +01:00
Juergen Spitzmueller
4d7453ac86 Remove redundant \\end_layout in jss-article Code Chunk reversion. 2015-12-26 12:08:10 +01:00
Juergen Spitzmueller
c76d91bb47 Fix gloss, glossgroup and forest reversion routines.
These were using lyx2latex, assuming the result can be used in verbatim
insets as is, which is not the case (mostly due to \\backslash).

A new lyx2verbatim function is now used instead. Also, ERT insets are
dissolved in the gloss reversion process.
2015-12-25 12:03:38 +01:00
Richard Heck
1c66831825 Fix a couple minor issues noticed by tests. 2015-12-17 10:04:47 -05:00
Richard Heck
7831e11717 Simplify a bunch of tests in lyx2lyx code. 2015-11-28 23:58:50 -05:00
Richard Heck
01b4e811a6 Fix a few C++-isms that crept into lyx2lyx code. 2015-11-28 23:55:00 -05:00
Richard Heck
acf3e3a139 Clean up Solution and Solution* reversion code a bit. 2015-11-28 23:42:09 -05:00
Uwe Stöhr
6f221bab03 lyx_2_2.py: fix a logic mistake
- this message must be used for all cases
2015-11-29 04:26:14 +01:00
Uwe Stöhr
4ea80e077f lyx2lyx/lyx_2_2.py: correct reversion for solution*
- add reversion for the starred variant
- correct LaTeX output
2015-11-29 03:51:57 +01:00
Georg Baum
ad0643f4b5 Fix off by one error
Looks like I forgot to test this case without quotes, but fortunately the new
export test found it.
2015-11-28 18:25:33 +01:00
Richard Heck
2c602ab051 Simplify lyx2lyx code a bit, and correct a mistake in my previous
patch. Also fix some escaping problems (\end instead of \\end).

My testing revealed some other problems with this routine: stray
\noindent tags popping up here and there. I don't have time to fix
it right now but will try to come back to it.
2015-11-25 00:51:05 -05:00
Uwe Stöhr
13c6350155 lyx_2_1.py: fix a mistake in previous commit 2015-11-25 00:05:44 +01:00
Uwe Stöhr
bfc749eb23 stdlayouts.inc: support for verbatim*
fileformat change
2015-11-24 23:56:26 +01:00
Uwe Stöhr
0ae337014e theorems-ams: add solution environment
fixes bug #6363 now completely
2015-11-18 02:36:49 +01:00
Uwe Stöhr
cc6c86ff3b theorems.inc: add environment "solution"
fileformat change, fixes bug #6363
2015-11-18 01:14:30 +01:00
Georg Baum
1fc3d051b1 Set \origin correctly when upgrading docs
lyx2lyx did not yet know about /systemlyxdir/ and set \origin to the path
where my git tree lives instead. This path is not usable except on my machine,
so better write something more usable instead.
This is a special command line switch of lyx2lyx, so it does not interfere
with normal usage. I did not try to deduce the systemlyxdir from lyx2lyx to
be on the safe side.
2015-11-11 21:35:12 +01:00
Georg Baum
2fc430d5ae Store both sets of font selections
This is one part of bug 9744: If you toggle between TeX fonts and non-TeX
fonts, the settings of the other choice are no longer thrown away, but stored
and re-activated if you switch back. Most parts of the patch are purely
mechanical (duplicating some BufferParams members), the only non-mechanical
change is in the GUI logic.
2015-11-09 07:36:42 +01:00
Uwe Stöhr
43a80ef7df lyx_2_2.py: add a safe guard 2015-11-04 02:18:28 +01:00
Uwe Stöhr
4933399507 lyx_2_2.py: fix the conversion of colored boxes 2015-11-04 01:36:39 +01:00
Uwe Stöhr
e52a4b738c lyx2lyx/lyx_2_2.py: remove unused code 2015-11-04 01:22:03 +01:00
Uwe Stöhr
62a69584e6 achemso.layout: add a flex inset
- this one is in achemso since version 3.8

- fileformat change
2015-11-04 01:18:13 +01:00
Richard Heck
4c16c61579 Add warning message if we do no conversion. 2015-11-01 16:32:52 -05:00
Richard Heck
221932f63a If lyx2lyx is asked to convert a file to the format it already is,
then just perform a null conversion. This seems better than aborting
with an error. I can imagine a script that converted all files in a
certain directory to format 498, and you don't want it to be an error
if one of them is already 498.

Prior to this, what lyx2lyx would do is convert to the lowest format
in the current version. So, e.g., asked to convert 498 to 498 it would
convert to 474. That is obviously wrong.
2015-11-01 16:27:58 -05:00
Juergen Spitzmueller
0314464392 remove debug message. 2015-10-31 12:10:49 +01:00
Uwe Stöhr
2c1851e2ec moderncv.layout: update some styles and add new ones
- support for at least modernCV 1.5 (layout will still work with moderncv 1.3 as before)
- fileformat change
2015-10-28 02:27:32 +01:00
Uwe Stöhr
ce933b1e14 colored-boxes.lyx: new example file for the tcolorbox.module
- also improve the tcolorbox.module

This is a fileformat change - only to be able to revert the new styles defined in the module.
2015-10-19 07:10:09 +02:00
Jean-Marc Lasgouttes
b7909e7e6c Remove support for precompiled headers for autotools
This was turned off by default for a long time, and it does not seem
to have any use these days.
2015-09-25 12:05:40 +02:00
Georg Baum
81e592603d Support units in external inset bbox
This brings the external inset on par with the graphics insets as far as the
clipping option is concerned. The graphicxs package supports both: A bounding
box without units (which means that bp ia assumed), and a bounding box with
units, so we can simply output the values including the units.
2015-07-16 22:06:35 +02:00
Georg Baum
0cbcc8a166 Remove InsetGraphics noUnzip parameter
Being able to compile document with zipped .eps files was a useful feature of
the graphicxs package 20 years ago, but the LyX support is no longer relevant:
- The flag is ignored if preview is on
- If pdflatex is used then uncompressing happens during the compilation anyway
- If set, the flag prevents LyX from issuing proper error messages if
something with the image is wrong
- For hard disk capacities from 20 years ago not uncompressing is a useful
feature, but for current hard disk capacities it does not matter
- The external inset does not have it, and if we want to merge both insets
one day we would need to implement it there, which is even more difficult
than in InsetGraphics
2015-07-16 20:44:47 +02:00
Georg Baum
a2f127f8c3 Fix lyx2lyx unicodesymbols escaping
The escaping of symbols read from unicodesymbols was inconsistent, which lead
to wrong replacements (bug 9559). Now the escaping is consistent: unicode_reps
contains unescaped LaTeX commands, the needed escaping for LyX files is
applied in put_cmd_in_ert() and lyx2latex().
2015-06-14 12:44:44 +02:00
Juergen Spitzmueller
aa4d41d282 Fix reversion of mathtools xarrows (bug #9620). 2015-06-14 10:47:31 +02:00
Uwe Stöhr
1b74cc421e lyx2lyx/lyx_2_2.py: fix typo in comment 2015-06-14 02:15:30 +02:00
Juergen Spitzmueller
77fa81a902 Fix revert_textcolor method (bug #9620) 2015-06-13 12:48:36 +02:00
Juergen Spitzmueller
111102909b Escape backslash 2015-06-13 11:37:36 +02:00
Richard Heck
e5323de7cf Try to fix bug #9587 correctly.
See the discussion there for the reasons for the changes.
2015-06-01 21:52:02 -04:00
Uwe Stöhr
098f160fc0 lyx2lyx/lyx_2_2.py: refine the colorbox reversion 2015-06-02 00:00:14 +02:00
Uwe Stöhr
abc922fc27 lyx2lyx/lyx_2_2.py: fix colorbox reversion
fixes bug #9587
2015-06-01 21:19:11 +02:00
Uwe Stöhr
5239a27bfc lyx2lyx/lyx_2_2.py: set correct default color 2015-06-01 20:57:45 +02:00
Uwe Stöhr
b621975fa7 lyx2lyx/lyx_2_2.py: remove unused code 2015-06-01 20:46:05 +02:00
Uwe Stöhr
266a047249 jss.layout: use Flex Inset for Code Chunk style as proposed by JMarc 2015-05-27 23:31:21 +02:00
Uwe Stöhr
f3c1a4fbeb jss.layout: remove superfluous Appendix style
- remove also the new superfluous lyx2lyx code
- update the template file
2015-05-27 02:13:04 +02:00
Uwe Stöhr
30f2accf77 jss.layout: changes as requested by the user in bug#9516
- added appendix style and lyx2lyx reversion
- add support for parsing \noindent
- update example file
2015-05-26 01:15:29 +02:00
Juergen Spitzmueller
dbe0096c12 Rename ref prefix "sub:" to "subsec:"
This solves a macro conflict between subfloat's \subref and our own
\subref definition (bug #7550)

File format change.
2015-05-24 13:50:21 +02:00
Uwe Stöhr
e6c225d582 jss.layout: support for more layouts
Since lyX 2.0 we support to use the in_preamble tag. This allows to support more commands. For an unknown reason I forgot the jss.layout when I updated the other layouts once.

Fileformat change
2015-05-24 03:34:36 +02:00
Uwe Stöhr
24b0ea7c95 lyx2lyx/lyx2lyx_tools.py: add support for parsing newline in lyx2latex 2015-05-23 23:58:19 +02:00
Enrico Forestieri
2e78738bf0 This is supposed to end with a '/' 2015-05-19 23:18:56 +02:00
Uwe Stöhr
5a1384d35c lyx2lyx/lyx_2_2.py: remove a hack
thanks Richard "hack" ;-) for the hint
2015-05-18 22:36:29 +02:00
Enrico Forestieri
a0afd3459f Take into account the file system encoding. 2015-05-17 18:02:47 +02:00
Georg Baum
69abac9605 Improve revert of mutlicolumn
Old LyX version can cope with degenerated multicolumn cells spanning only one
column, so these should not cause a conversion of the whole formula to ERT.
Such columns are used to set border lines or alignment for single cells.
2015-05-17 16:39:14 +02:00
Georg Baum
39329935f3 Parse \multicolumn in math (bug 396)
The math parser could not handle multicolumn grids. This is a problem because
there is no true ERT in math (everything is parsed).
Now multicolumn cells are parsed correctly. The display is also somewhat OK,
but apart from that any multicolumn related UI is missing. Since the file
format change is now done the UI can be added at any later point. The most
important part of bug 396 is now fixed: tex2lyx does not create invalid .lyx
files anymore for formulas containing \multicolumn.

I updated the tex2lyx test cases that produce correct output. tex2lyx does
still produce invalid output for the test cases which are not updated because
of the previous format change.
2015-05-17 13:43:37 +02:00
Uwe Stöhr
8ede3618f0 lyx2lyx/lyx_2_2.py: fix for a lyx2lyx issue
I don't understand why the string "shadowsize" is not already in the file because when I convert from format 474 to 489 it is added. So why is it not there when I convert from format 474 to 491.
2015-05-17 02:48:22 +02:00
Uwe Stöhr
d33caae010 lyx2lyx/lyx_2_2.py: correct a value 2015-05-16 23:29:09 +02:00
Uwe Stöhr
88593e0ec6 support for colored boxes
adds support to set colors for some box types (support for the LaTeX commands \fcolorbox and \colorbox)

fileformat change
2015-05-16 03:22:37 +02:00
Uwe Stöhr
53be3321ba lyx2lyx/lyx_2_2.py: a fix 2015-05-15 04:21:47 +02:00
Uwe Stöhr
225ecc581f lyx2lyx/lyx_2_2.py: correct a description 2015-05-15 03:41:43 +02:00
Uwe Stöhr
e35bb3126a support for all default colors of the package xcolor
fileformat change
2015-05-14 22:23:44 +02:00
Enrico Forestieri
306b136cc0 Fix bug #4812 (Layout in local directory lost on Save As, Copying)
The "save-as" part of the bug is fixed by extending the \textclass tag
such that, if a local layout file is used, its path relative to the
document directory is now stored together with the name. If a relative
path cannot be used, an absolute one is used but, in this case, the
document is not usable on a different platform.

The "copy" part is fixed by introducing a new \origin tag, which is
written when the file is saved. This tag stores the absolute path of
the document directory. If the document is manually copied to a
different location, the local layout file is retrivied by using
\origin (which is only updated on save).
This new tag may prove useful also for locating other files when the
document is manually moved to a different directory.

As in the original implementation the files needed for the layout
(for example, a latex class) had to be in the same directory as the
layout file, this directory has also to be added to TEXINPUTS.
2015-05-13 22:02:13 +02:00
Uwe Stöhr
8010b90cb4 add ability to change box line thickness and separation
fileformat change
2015-05-11 21:30:32 +02:00
Uwe Stöhr
94f6bf3367 lyx_2_2.py: fix a typo 2015-05-10 01:35:55 +02:00
Uwe Stöhr
3c9442fd04 lyx2lyx/lyx_2_2.py: correct a description 2015-05-03 02:16:32 +02:00
Juergen Spitzmueller
c886679160 Rewrite the linguistic Glosse insets.
This gets rid of the PassThru hack and makes the inset actually usable
for linguistists.

Fixes: #7773

File format change.
2015-04-21 20:33:35 +02:00
Juergen Spitzmueller
c1dcecb376 Fix version number 2015-04-21 15:48:32 +02:00
Juergen Spitzmueller
7158f7b58d Add support for linguistic trees (via forest) 2015-04-20 18:14:42 +02:00
Juergen Spitzmueller
225a37be39 Support item argument in linguistic examples
File format change.
2015-04-20 12:15:20 +02:00
Georg Baum
4069e3daed Update tex2lyx test references
The lyx2lyx conversions for the new formats are empty, therefore we can simply
update the format number.
2015-04-12 10:07:42 +02:00
Juergen Spitzmueller
319ee3296a File format change caused by 34eadf5d4. 2015-04-09 11:01:44 +02:00
Uwe Stöhr
6d4aec1f0e lyx2lyx/lyx_2_2.py: correct a whitespace mistake 2015-04-06 06:08:26 +02:00
Uwe Stöhr
c6b17b685a support for Georgian
add support to set Georgian as document language, fileformat change
2015-04-06 06:00:11 +02:00
José Matos
908e93df50 Fix bug #9279
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..
2015-03-31 15:14:26 +01:00
Juergen Spitzmueller
0e62bf9e0a Fix thinko in convert_corollary_args
Fixes: #9478
2015-03-24 21:43:25 +01:00
Georg Baum
49ac79100b Make InsetSpecialChar names more consistent
This is the rersult of a discussion on the list. Now all special characters
have meaningful names, and it is clear that the LyX file syntax is not LaTeX.
2015-03-23 21:28:04 +01:00
José Matos
9a0d70a45f First step to make lyx2lyx code support both python 2 and python 3 (3.3+)
Most of the changes are related with dictionaries returning views instead of
lists.

xrange -> range (since xrange is gone in python 3)

The code that is special to support both python 2 and 3 is enclosed in a comment
 \# Provide support for both python 2 and 3
and
 \# End of code to support for both python 2 and 3

And so later it can be removed safely when python 2 is no longer supported.
2015-03-11 12:09:18 +00:00
Georg Baum
c0041e7fa5 Fix stupid copy-paste error
Now the conversion to 2.1.x works again
2015-03-02 20:57:26 +01:00
Georg Baum
317b29dc6d Fix lyx2lyx conversion for file insets
Both the hyphen and special phrase conversion did not exclude insets which
reference external files. This was wrong since LyX does not replace
\SpecialCharNoPassThru etc for these insets.
2015-03-01 22:16:45 +01:00
Georg Baum
3e9e6e344a Replace automatic logofication with insets
Previously, LyX did replace some words with typeset logos, and there was no
way to prvent this except putting them, in ERT (bug #4752). Now we have
special insets for these words, and standard text is left alone.
2015-03-01 11:16:57 +01:00
Georg Baum
d50154ab04 Fix wrong CommandInset lyx2lyx conversion
Thanks to Scott for testing. Command insets do not use InsetText for the
arguments, so users have to write them in LaTeX syntax (this is bug #4595).
Therefore we must leave hyphens alone in these insets.
2015-03-01 10:52:13 +01:00
Georg Baum
ddb82b74f0 Make convert_dashes and revert_dashes symmetric
Otherwise we could destroy math stuff.
2015-02-26 20:34:36 +01:00
Georg Baum
8aa37c43a1 Fix plaintext output of dashes (bug #3647)
Previously, consecutive dashes in .lyx files were combined to endash and emdash
in some cases, and in other cases they were output as is. This made the code
complicated, and resulted in inconsitencies ((bug #3647).
Now, a dash in a .lyx file is always a dash in the output, for all flavours.
The special handling is moved to the input side, so that you still get an
endash if you type two hyphens. If needed, this can be changed or made
customizable without the need to update the file format again. Many thanks
for the fruitful mailing list dicsussion, which contributed significantly to
the final version.
2015-02-24 22:06:12 +01:00
Juergen Spitzmueller
712773eeed Fix reversion of beamer description overlay args
Candidate for branch.
2015-02-13 17:45:38 +01:00
Juergen Spitzmueller
b47b4299e0 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:01:57 +01:00
Juergen Spitzmueller
24d3236493 Fix conversion of frame ends when frame is nested in inset
Fixes: #9409
2015-02-13 10:15:29 +01:00
Juergen Spitzmueller
3d8b02b58e 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).

Candidate for branch.
2015-02-13 10:13:43 +01:00
Juergen Spitzmueller
706960eba4 Add Question and Question* theorem types (bug #9015)
File format change.
2015-01-09 11:24:45 +01:00
Juergen Spitzmueller
9a84737d5b Honor paragraph parameters when converting chunk layouts.
Fixes: #9320.
2014-12-01 12:35:46 +01:00
Juergen Spitzmueller
50a77ab2d1 Fix and simplify par params parsing in get_containing_layout.
The previous verion did not catch \align <alignment>.

Richard, this should go to branch as well.
2014-11-29 10:54:05 +01:00
Jean-Marc Lasgouttes
6442b3a0c0 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-11-27 16:32:58 +01:00
Juergen Spitzmueller
4066fcac16 Fix conversion of beamer block titles when the language is switched at the beginning of the title 2014-11-25 17:47:14 +01:00
Richard Heck
9ee9c9b97d Fix bug 9300. We need manually to convert newlines to paragraph breaks.
(cherry picked from commit 8f40d784c0)
2014-11-04 10:05:59 -05:00
Juergen Spitzmueller
15d3b7bae2 lyx2lyx: fix convert_chunks for empty chunk layouts
Fixes: #9298
2014-10-15 14:07:14 +02:00
Juergen Spitzmueller
5fed02159c Fix some convert_TeX_brace_to_Argument glitches
Fixes: #9273
2014-09-16 17:42:19 +02:00
Kornel Benko
6c7b5b12c7 Add cmake files to autoconf's dist 2014-08-31 15:21:20 +02:00
Juergen Spitzmueller
9a702f195d Add support for beamer lemma environment.
File fomat change.
2014-08-31 12:30:14 +02:00
Juergen Spitzmueller
98ab605041 Fix lyx2lyx issue with complex beamer arguments.
Fixes: #9254
2014-08-30 13:24:29 +02:00
Uwe Stöhr
94a9c127e3 support for the LaTeX commands \x***arrow
- this patch supports the \x***arrow commands provided by the mathtool package
- fileformat change
2014-08-25 00:44:09 +02:00
Juergen Spitzmueller
e9681bbe08 Do not break documents with complex beamer block ERT usage we cannot handle
Fixes: #9144
2014-08-03 12:21:35 +02:00
Juergen Spitzmueller
d62ba3c333 Improve parsing of ERT arguments in beamer block titles.
Fixes: #9225
2014-08-01 09:42:43 +02:00
Juergen Spitzmueller
cc56c64ede Fix beamer block conversion when arguments are in multiple ERTS.
Fixes second part of #9208.
2014-07-27 11:30:25 +02:00