Partial fox for bug #6622: Display \utilde and \undertilde on screen correctly.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38675 a592a061-630c-0410-9148-cb99ea01b6c8

development/scons/scons_manifest.py

@@ -2074,6 +2074,7 @@ lib_images_math_files = Split('''
     underrightarrow.png
     underscore.png
     underset.png
+    undertilde.png
     uparrow.png
     uparrow2.png
     updownarrow.png
@@ -2085,6 +2086,7 @@ lib_images_math_files = Split('''
     upsilon2.png
     upuparrows.png
     urcorner.png
+    utilde.png
     varepsilon.png
     varkappa.png
     varnothing.png

lib/Makefile.am

@@ -936,6 +936,7 @@ dist_imagesmath_DATA = \
 	images/math/underrightarrow.png \
 	images/math/underscore.png \
 	images/math/underset.png \
+	images/math/undertilde.png \
 	images/math/uparrow.png \
 	images/math/uparrow2.png \
 	images/math/updownarrow.png \
@@ -947,6 +948,7 @@ dist_imagesmath_DATA = \
 	images/math/upsilon2.png \
 	images/math/upuparrows.png \
 	images/math/urcorner.png \
+	images/math/utilde.png \
 	images/math/varepsilon.png \
 	images/math/varkappa.png \
 	images/math/varnothing.png \

lib/chkconfig.ltx

@@ -309,6 +309,7 @@
 \TestPackage{subscript}
 \TestPackage[turkmen.ldf]{turkmen}
 \TestPackage{ulem}
+\TestPackage{undertilde}
 \TestPackage{units}
 \TestPackage{url}
 \TestPackage{varioref}

lib/doc/LaTeXConfig.lyx

@@ -5591,6 +5591,41 @@ ulem
  to PDF.
 \end_layout
 
+\begin_layout Subsection
+undertilde
+\end_layout
+
+\begin_layout Description
+Found: 
+\begin_inset Info
+type  "package"
+arg   "undertilde"
+\end_inset
+
+
+\end_layout
+
+\begin_layout Description
+CTAN: 
+\family typewriter
+macros/latex/contrib/undertilde/
+\end_layout
+
+\begin_layout Description
+Notes: The package 
+\family sans
+undertilde
+\family default
+ provides the
+\family sans
+ 
+\backslash
+utilde
+\family default
+ command.
+ It is needed by LyX to underline symbols with a tilde in formulas.
+\end_layout
+
 \begin_layout Subsection
 units
 \end_layout

lib/symbols

@@ -26,6 +26,14 @@ underleftarrow      decoration none       amsmath
 underleftrightarrow decoration none       amsmath
 underline           decoration none
 underrightarrow     decoration none       amsmath
+#Do not load automatically, it redefines some other symbols, and we don't
+#have a possibility to turn automatic loading off like for ams
+#undertilde          decoration none       accents
+undertilde          decoration none
+#Do not load automatically, since it might conflict with user macros and we
+#don't have a possibility to turn automatic loading off like for ams
+#utilde              decoration none       undertilde
+utilde              decoration none
 vec                 decoration none
 widehat             decoration none
 widetilde           decoration none

lib/ui/stdtoolbars.inc

@@ -398,6 +398,8 @@ ToolbarSet
 		Item "check" "math-insert \check"
 		Item "widehat" "math-insert \widehat"
 		Item "widetilde" "math-insert \widetilde"
+# enable this once the undertilde package is loaded automatically
+#		Item "utilde" "math-insert \utilde"
 		Item "vec" "math-insert \vec"
 		Item "acute" "math-insert \acute"
 		Item "ddot" "math-insert \ddot"

src/LaTeXFeatures.cpp

@@ -614,7 +614,8 @@ char const * simplefeatures[] = {
 	"amscd",
 	"slashed",
 	"multirow",
-	"tfrupee"
+	"tfrupee",
+	"undertilde",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);

src/mathed/InsetMathDecoration.cpp

@@ -47,7 +47,7 @@ Inset * InsetMathDecoration::clone() const
 
 bool InsetMathDecoration::upper() const
 {
-	return key_->name.substr(0, 5) != "under";
+	return key_->name.substr(0, 5) != "under" && key_->name != "utilde";
 }
 
 
@@ -93,7 +93,9 @@ bool InsetMathDecoration::wide() const
 			key_->name == "widetilde" ||
 			key_->name == "underleftarrow" ||
 			key_->name == "underrightarrow" ||
-			key_->name == "underleftrightarrow";
+			key_->name == "underleftrightarrow" ||
+			key_->name == "undertilde" ||
+			key_->name == "utilde";
 }
 
 
@@ -204,6 +206,8 @@ namespace {
 		// this is the macron, again, but it works
 		t["underline"] = Attributes(false, "¯");
 		t["underrightarrow"] = Attributes(false, "⟶");
+		t["undertilde"] = Attributes(false, "∼");
+		t["utilde"] = Attributes(false, "∼");
 		t["vec"] = Attributes(true, "→");
 		t["widehat"] = Attributes(true, "^");
 		t["widetilde"] = Attributes(true, "∼");

src/mathed/MathSupport.cpp

@@ -287,6 +287,8 @@ named_deco_struct deco_table[] = {
 	{"underleftarrow",      arrow,    1 },
 	{"underrightarrow",     arrow,    3 },
 	{"underleftrightarrow", udarrow,  1 },
+	{"undertilde",          tilde,    0 },
+	{"utilde",              tilde,    0 },
 
 	// Delimiters
 	{"(",              parenth,    0 },

status.20x

@@ -76,6 +76,8 @@ What's new
 - Show the correct label after adding a line to an AMS Multline formula (bug
   #7511).
 
+- Display \utilde and \undertilde in formulas correctly (part of bug #6622).
+
 
 * DOCUMENTATION AND LOCALIZATION