From c5c04954f3d5c7c3784d3e1cdd20663aa509dd76 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 23 Oct 2011 10:58:05 +0000 Subject: [PATCH] Import \uuline, \uwave and \sout git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39937 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/TODO.txt | 2 -- src/tex2lyx/preamble.cpp | 6 ++++++ src/tex2lyx/text.cpp | 11 ++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index e625d83ac9..62ec4b6b84 100644 --- 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 a6861b490b..5e26bfb336 100644 --- 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 bd8d02030a..9665816486 100644 --- 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); -- 2.39.5