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.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40667 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 0c6aa6050ac91a3196bfc0dc8c718d13a761d292..b838f9e0e7a789d3b4e5c808b852968876bfaa91 100644 (file)
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -488,12 +488,12 @@ convert = [
            [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]],

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index da13ccb34785c9e7b045ce0ff88e8e4d9b6af3cf..58daaac6fc22b5450f664f046d77e0e668b05c27 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -576,6 +576,7 @@ char const * simplefeatures[] = {
        "mathrsfs",
        "mathabx",
        "mathtools",
+       "cancel",
        "ascii",
        "url",
        "covington",
@@ -728,9 +729,6 @@ string const LaTeXFeatures::getPackages() const
                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