Import \uuline, \uwave and \sout

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

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index e625d83ac91a188dd83d95c195a35d53e0b99df7..62ec4b6b84afba3bf9499a8f27d624d7ed656da6 100644 (file)
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -57,8 +57,6 @@ Format LaTeX feature                        LyX feature
 351    ?                                    \backgroundcolor
 353    \printsubindex                       InsetIndex
 354    \printindex*, \printsubindex*        InsetIndex
-355    \sout                                fonts
-356    \uuline, \uwave                      fonts
 358    custom bibtex command                \bibtex_command
 358    custom makeindex command             \index_command
 359    set_width                            InsetCommand nomencl_print

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index a6861b490b0be43dcedf7ba7c3b82533aa959303..5e26bfb336b27611e9a1f10f2a2f4bf4f0017279 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -596,6 +596,12 @@ void handle_package(Parser &p, string const & name, string const & opts,
        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)
+       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.

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index bd8d02030a970fd1c0a4308b467dfc7f10be2d00..966581648699211be4538e22173aad38073517ee 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2423,7 +2423,16 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        os << "\n\\bar default\n";
                }
 
-               else if (t.cs() == "emph" || t.cs() == "noun") {
+               else if (t.cs() == "sout") {
+                       context.check_layout(os);
+                       os << "\n\\strikeout on\n";
+                       parse_text_snippet(p, os, FLAG_ITEM, outer, context);
+                       context.check_layout(os);
+                       os << "\n\\strikeout default\n";
+               }
+
+               else if (t.cs() == "uuline" || t.cs() == "uwave" ||
+                        t.cs() == "emph" || t.cs() == "noun") {
                        context.check_layout(os);
                        os << "\n\\" << t.cs() << " on\n";
                        parse_text_snippet(p, os, FLAG_ITEM, outer, context);