Add fixltx2e module which simply loads fixltx2e.sty.

This module can be used instead of \usepackage{fixltx2e} in the preamble
to avoid duplicate definitions of \textsubscript.

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 405794300d10d41ed130426b95b849e9e8c871f4..c1184f2120f4a92727bd521cd51f9526dc77d373 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -2926,6 +2926,7 @@ lib_layouts_module_files = Split('''
     endnotes.module
     eqs-within-sections.module
     figs-within-sections.module
+    fixltx2e.module
     foottoend.module
     hanging.module
     initials.module

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 493e3318e94e9c2757f42183796193bd303e1921..f4ff7ff82aa42c5b1cd01f866d3811487d0ebbd2 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1098,6 +1098,7 @@ dist_layouts_DATA =\
        layouts/extletter.layout \
        layouts/extreport.layout \
        layouts/figs-within-sections.module \
+       layouts/fixltx2e.module \
        layouts/foils.layout \
        layouts/foottoend.module \
        layouts/frletter.layout \

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
new file mode 100644 (file)
index 0000000..50a44e7
--- /dev/null
+++ b/lib/layouts/fixltx2e.module
@@ -0,0 +1,14 @@
+#\DeclareLyXModule{Fix LaTeX}
+#DescriptionBegin
+#Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX.
+#Those fixes are not part of the LaTeX kernel because of backward compatibility.
+#If you use this module your typeset document may look different
+#when you process it with future LaTeX versions, because fixltx2e may provide
+#more bugfixes in future versions.
+#DescriptionEnd
+
+# Author : Georg Baum <baum@lyx.org>
+
+Format 30
+
+Requires fixltx2e

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index bc19ac5f14eb14932ce8bce6145f3925f0027c2c..f830f60e4830665fd18666decfe29b78d35cc59d 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -575,7 +575,7 @@ char const * simplefeatures[] = {
        "framed",
        "soul",
        "textcomp",
-       "subscript",
+       "fixltx2e",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -823,6 +823,10 @@ string const LaTeXFeatures::getPackages() const
                            "\\makenomenclature\n";
        }
 
+       // fixltx2e provides subscript
+       if (mustProvide("subscript") && !isRequired("fixltx2e"))
+               packages << "\\usepackage{subscript}\n";
+
        return packages.str();
 }