Author: jrioux
Date: Mon Jan 23 18:20:07 2012
New Revision: 40667
URL: http://www.lyx.org/trac/changeset/40667
Log:
Small fixups to r40663
lyx2lyx: Clean up the convert/revert queue.
LaTeXFeatures: Just add cancel to the list of packages that are
simply used with a \usepackage{} line.
Uwe: In case cancel needs to be loaded after amsmath or something,
please revert my changes to LaTeXFeatures and add a comment
about package ordering to the source. Thanks.
Modified:
lyx-devel/trunk/lib/lyx2lyx/lyx_2_1.py
lyx-devel/trunk/src/LaTeXFeatures.cpp
Modified: lyx-devel/trunk/lib/lyx2lyx/lyx_2_1.py
==============================================================================
--- lyx-devel/trunk/lib/lyx2lyx/lyx_2_1.py Mon Jan 23 03:00:36 2012
(r40666)
+++ lyx-devel/trunk/lib/lyx2lyx/lyx_2_1.py Mon Jan 23 18:20:07 2012
(r40667)
@@ -488,12 +488,12 @@
[422, [convert_use_packages]],
[423, [convert_use_mathtools]],
[424, [convert_cite_engine_type]],
- [425, []]
+ [425, []],
]
revert = [
[424, [revert_cancel]],
- [423, [revert_cite_engine_type, revert_cancel]],
+ [423, [revert_cite_engine_type]],
[422, [revert_use_mathtools]],
[421, [revert_use_packages]],
[420, [revert_longtable_captions]],
Modified: lyx-devel/trunk/src/LaTeXFeatures.cpp
==============================================================================
--- lyx-devel/trunk/src/LaTeXFeatures.cpp Mon Jan 23 03:00:36 2012
(r40666)
+++ lyx-devel/trunk/src/LaTeXFeatures.cpp Mon Jan 23 18:20:07 2012
(r40667)
@@ -576,6 +576,7 @@
"mathrsfs",
"mathabx",
"mathtools",
+ "cancel",
"ascii",
"url",
"covington",
@@ -728,9 +729,6 @@
params_.use_package("undertilde") != BufferParams::package_off)
packages << "\\usepackage{undertilde}\n";
- if (mustProvide("cancel"))
- packages << "\\usepackage{cancel}\n";
-
// [x]color and pdfcolmk are handled in getColorOptions() above
// makeidx.sty
