Commit Graph

33906 Commits

Author SHA1 Message Date
Georg Baum
84cca2dd94 Fix indentation 2015-05-17 17:27:27 +02:00
Uwe Stöhr
92b7ee46ed tex2lyx: support the command \colorbox
support for \fcolorbox will follow soon
2015-05-17 17:26:51 +02:00
Juergen Spitzmueller
b7c53b6017 Use view/data separation for GuiCharacter colors, which makes it possible to sort the colors 2015-05-17 17:15:01 +02:00
Juergen Spitzmueller
8fc637103f Factor out ColorSorter to qt_helpers, to make it
available to other dialogs as well.
2015-05-17 16:47:40 +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
Kornel Benko
3cd36977c9 Updated remaining tex2lyx test cases after commit 12ae7140c2 2015-05-17 15:53:58 +02:00
Kornel Benko
e2d4197068 Cmake build: Added target updatetex2lyxtests to update lyx2lyx test files 2015-05-17 15:51:28 +02:00
Uwe Stöhr
12ae7140c2 tex2lyx/text.cpp: add default value for 2 box features
- also add a comment
2015-05-17 15:00:51 +02:00
Juergen Spitzmueller
f7dba65e10 Customization.lyx: remove unintended switch to German 2015-05-17 13:57:12 +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
46671b5836 InsetBox.cpp: code simplification
thanks Pavel for the hint
2015-05-17 03:21:02 +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
8dd217c983 GuiBox.cpp: fix bug introduced by [bec3f7bc/lyxgit]
There were now 2 entries named "none" in backgroundcolorCO

- delete the fixmes; the LateX name is used as parameter to save unnecessary conversions for the LateX output; please ask me before adding fixmes
2015-05-17 01:45:56 +02:00
Uwe Stöhr
51e3b026b2 GuiBox.cpp: a compile fix 2015-05-17 01:28:06 +02:00
Enrico Forestieri
324abefd53 Fix #5575 also on Windows. 2015-05-16 23:36:40 +02:00
Uwe Stöhr
d33caae010 lyx2lyx/lyx_2_2.py: correct a value 2015-05-16 23:29:09 +02:00
Enrico Forestieri
62d36bf04d Correctly load documents moved elsewhere after save.
It is now possible opening documents that where manually moved to a
different location after they were saved and still produce an output.
Indeed, (hopefully) all needed included files are now still found.
When the moved document is saved again, all paths are accordingly updated.
Of course, for this to work, a document has to be saved in Format 490,
at least.

As an example, after converting the user guide to the last format, it can
be copied anywhere and opened without the need of adapting the paths of
included files or moving them to a proper place.

There is one glitch I am aware of. When moving a child document (but not
the master) the path to the master is correctly updated but it won't be
recognized as such. This is because LyX checks that the parent actually
includes this document but, of course, being the parent document not
touched, it appears not including this child. Anyway, it will also occur
when saving the child to a different location and the user is warned
on the terminal about this fact when the moved child is loaded.
However, there is no problem when it is the master that has been moved.
2015-05-16 19:52:39 +02:00
Juergen Spitzmueller
853283ca87 Extend comment and remove superfluous parentheses. 2015-05-16 19:18:51 +02:00
Juergen Spitzmueller
9e57f906c2 Refine fix for #5575 and comment it out for windows
See #5575 for details why it does not work on windows.
2015-05-16 17:16:01 +02:00
Kornel Benko
a594086d87 Update sk.po 2015-05-16 16:14:27 +02:00
Juergen Spitzmueller
6d22fea199 de.po once more 2015-05-16 15:41:54 +02:00
Juergen Spitzmueller
1738d4e409 Fix tooltip line breaks. 2015-05-16 15:41:22 +02:00
Juergen Spitzmueller
818249f69f Clarify "Save compressed by default" feature (bug 7822) 2015-05-16 15:31:51 +02:00
Juergen Spitzmueller
b014f54250 minor corrections 2015-05-16 15:02:09 +02:00
Georg Baum
f728257f26 Shut up compiler warning 2015-05-16 14:06:34 +02:00
Juergen Spitzmueller
673217593e Update comment. 2015-05-16 13:48:53 +02:00
Georg Baum
96cdd70ec1 Update boost to version 1.58
This is an unmodified subset of boost 1.58, created with boost/extract.sh.
2015-05-16 13:46:25 +02:00
Juergen Spitzmueller
9301cec6d9 de.po 2015-05-16 13:32:40 +02:00
Juergen Spitzmueller
69fe51f9d8 Fix casing 2015-05-16 13:30:23 +02:00
Juergen Spitzmueller
14e56a5ee9 de.po 2015-05-16 12:49:03 +02:00
Juergen Spitzmueller
b5fbd9f2a2 Fix Box UI (buddies and accelerators) 2015-05-16 12:46:08 +02:00
Georg Baum
08b2859663 Do not require esint for \int (bug 9498)
We also get a consistent look with amsmath, so require esint or amsmath.
When resolving alternatives, do also take into account whether the package
is available. For this to work, we also need to test for amsmath.sty (which
was surprisingly not yet done).
2015-05-16 12:29:54 +02:00
Juergen Spitzmueller
bec3f7bc8c Fix up GuiBox (use proper data/view separation and clean up) 2015-05-16 11:27:13 +02:00
Georg Baum
1e4700b277 Remove bash construct
Now it should work with any sh compatible shell
2015-05-16 11:11:08 +02:00
Kornel Benko
bb5c9fc19a Update sk.po 2015-05-16 10:42:21 +02:00
Uwe Stöhr
bd80617cdb GuiBox.cpp: enable color features also for non-English locales
stupid me, I used a translatable string as box parameter. Therefore the feature only worked correctly with English locale. Now it works for every locale.
2015-05-16 05:22:22 +02:00
Uwe Stöhr
0140063c8e GuiBox.cpp: add a comment and a string conversion 2015-05-16 03:54:51 +02:00
Uwe Stöhr
a49f24767a GuiCharacter.cpp: sort all colors, also white
as proposed by Scott
2015-05-16 03:32:45 +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
Georg Baum
b596330093 Fix compilation with boost 1.58
Newer boost versions use complicated type traits for boost::next and
boost::prior, which do not work with the RandomAccessList iterators.
The long term solution is to use std::next and std::prev, for now supply
simple replacements for compilers that do not support C++11 yet.
2015-05-16 00:05:23 +02:00
Georg Baum
ef456e9607 Update tex2lyx test references correctly
This was produced by

make updatetests
2015-05-15 21:27:47 +02:00
Georg Baum
b2b68969ab Revert broken tex2lyx test reference update
Revert "tex2lyx testfiles: update to latest fileformat"
This reverts commit afdfc3cf43.

The tex2lyx test vrefernces must be produced by tex2lyx, otherwise the tests
would still fail.
2015-05-15 21:23:29 +02:00
Georg Baum
e56a24dfcc Add note about updating tex2lyx tests 2015-05-15 21:20:28 +02:00
Georg Baum
b147cd0f3a Instantiate trivial_string::c_str() explicitly
This fixes hopefully the compilation of check_trivstring on cygwin and
solaris. Previously I did not use the explicit instantiation, because c_str()
is used by other explicitly instantiated methiods, but for some reason this
does not seem to suffice.
2015-05-15 21:01:59 +02:00
Uwe Stöhr
ffb4146d17 GuiBox.cpp: fix logic
- if pagebreaks are allowed there cannot be defined a width
2015-05-15 06:04:46 +02:00
Uwe Stöhr
6780a30409 GuiBox.cpp: fix logic
- if pagebreaks are allowed there cannot be defined a width
2015-05-15 06:02:41 +02:00
Uwe Stöhr
53be3321ba lyx2lyx/lyx_2_2.py: a fix 2015-05-15 04:21:47 +02:00
Uwe Stöhr
7bb691b8ad InsetBox.cpp: code simplification 2015-05-15 03:59:04 +02:00
Uwe Stöhr
a5cc5dce3c GuiBox.cpp: assure that the parameters are not empty 2015-05-15 03:51:11 +02:00
Uwe Stöhr
225ecc581f lyx2lyx/lyx_2_2.py: correct a description 2015-05-15 03:41:43 +02:00