Author: baum
Date: Sun Oct 30 19:51:41 2011
New Revision: 40097
URL: http://www.lyx.org/trac/changeset/40097
Log:
Only the packages subscript and ulem if they are automatically loaded
Modified:
lyx-devel/trunk/src/tex2lyx/Preamble.cpp
lyx-devel/trunk/src/tex2lyx/test/box-color-size-space-align.tex
lyx-devel/trunk/src/tex2lyx/text.cpp
Modified: lyx-devel/trunk/src/tex2lyx/Preamble.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/Preamble.cpp Sun Oct 30 19:41:48 2011
(r40096)
+++ lyx-devel/trunk/src/tex2lyx/Preamble.cpp Sun Oct 30 19:51:41 2011
(r40097)
@@ -671,10 +671,7 @@
else if (name == "url")
; // ignore this
- else if (name == "subscript")
- ; // ignore this
-
- else if (name == "color") {
+ else if (name == "color" || name == "subscript" || name == "ulem") {
if (!in_lyx_preamble)
h_preamble << package_beg_sep << name
<< package_mid_sep << "\\usepackage{"
@@ -687,13 +684,6 @@
else if (name == "setspace")
; // ignore this
-#if 0
- // do not ignore as long as we don't support all commands (e.g. \xout
is missing)
- // and as long as we don't support change tracking
- else if (name == "ulem")
- ; // ignore this
-#endif
-
else if (name == "geometry")
; // Ignore this, the geometry settings are made by the
\geometry
// command. This command is handled below.
Modified: lyx-devel/trunk/src/tex2lyx/test/box-color-size-space-align.tex
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/test/box-color-size-space-align.tex Sun Oct
30 19:41:48 2011 (r40096)
+++ lyx-devel/trunk/src/tex2lyx/test/box-color-size-space-align.tex Sun Oct
30 19:51:41 2011 (r40097)
@@ -19,6 +19,8 @@
\usepackage{framed}
\usepackage{calc}
\usepackage{fancybox}
+\PassOptionsToPackage{normalem}{ulem}
+\usepackage{ulem}
\setlength{\parskip}{3mm}
\setlength{\parindent}{0sp}
@@ -223,9 +225,11 @@
Strike out: \sout{test}
+Crossed out: \xout{test}
+
Noun: \noun{test}
-Underbar, ephasized, stikreout: \emph{\uline{\sout{test}}}
+Underbar, emphasized, strikeout: \emph{\uline{\sout{test}}}
\section{Paragraph spacing}
Modified: lyx-devel/trunk/src/tex2lyx/text.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/text.cpp Sun Oct 30 19:41:48 2011
(r40096)
+++ lyx-devel/trunk/src/tex2lyx/text.cpp Sun Oct 30 19:51:41 2011
(r40097)
@@ -2591,6 +2591,7 @@
parse_text_snippet(p, os, FLAG_ITEM, outer, context);
context.check_layout(os);
os << "\n\\bar default\n";
+ preamble.registerAutomaticallyLoadedPackage("ulem");
}
else if (t.cs() == "sout") {
@@ -2599,6 +2600,7 @@
parse_text_snippet(p, os, FLAG_ITEM, outer, context);
context.check_layout(os);
os << "\n\\strikeout default\n";
+ preamble.registerAutomaticallyLoadedPackage("ulem");
}
else if (t.cs() == "uuline" || t.cs() == "uwave" ||
@@ -2608,6 +2610,8 @@
parse_text_snippet(p, os, FLAG_ITEM, outer, context);
context.check_layout(os);
os << "\n\\" << t.cs() << " default\n";
+ if (t.cs() == "uuline" || t.cs() == "uwave")
+
preamble.registerAutomaticallyLoadedPackage("ulem");
}
// FIXME, the inset layout should be plain, not standard, see
bug #7846
@@ -2918,6 +2922,8 @@
os << t.cs().substr(4) << '\n';
parse_text_in_inset(p, os, FLAG_ITEM, false, context);
end_inset(os);
+ if (t.cs() == "textsubscript")
+
preamble.registerAutomaticallyLoadedPackage("subscript");
}
else if (is_known(t.cs(), known_quotes)) {
