Fix bug #7640: Importing underlined text fails in LyX 2.0

Just recognize \uline as a synonym or \underbar.

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

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 4471bffa2e2ccb7943e80de1f5accb3487f734e6..346922fc2c03703283bc3067e97b2b5440903b67 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -2360,7 +2360,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                                handle_ert(os, t.asInput() + "{" + color + "}", context);
                }
 
-               else if (t.cs() == "underbar") {
+               else if (t.cs() == "underbar" || t.cs() == "uline") {
                        // Do NOT handle \underline.
                        // \underbar cuts through y, g, q, p etc.,
                        // \underline does not.