From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 21 Jun 2011 13:24:26 +0000 (+0000)
Subject: Fix bug #7640: Importing underlined text fails in LyX 2.0
X-Git-Tag: 2.1.0beta1~3001
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=79fb39058c9f529c5aca6e3261c4525a93c62833;p=features.git

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 4471bffa2e..346922fc2c 100644
--- 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.