* InsetMathNest.C (handleFont): avoid crash on undo when

[lyx.git] / src / lyx_sty.C

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index 0d754ea08d6bdfb4a640777f14ac6180b705686f..9b0874948cbdee87e7af05e71b81cd692bb80613 100644 (file)
--- a/src/lyx_sty.C
+++ b/src/lyx_sty.C
@@ -12,6 +12,9 @@
 
 #include "lyx_sty.h"
 
+
+namespace lyx {
+
 using std::string;
 
 
@@ -30,7 +33,7 @@ string const lyxline_def =
 string const noun_def = "\\newcommand{\\noun}[1]{\\textsc{#1}}";
 
 string const lyxarrow_def =
-      "\\newcommand{\\lyxarrow}{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}";
+       "\\newcommand{\\lyxarrow}{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}";
 
 // for quotes without babel. This does not give perfect results, but
 // anybody serious about non-english quotes should use babel (JMarc).
@@ -125,4 +128,14 @@ string const tabularnewline_def =
 
 string const lyxgreyedout_def =
        "%% The greyedout annotation environment\n"
-       "\\newenvironment{lyxgreyedout}{\\color[gray]{0.8}}{}\n";
+       "\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n";
+
+// We want to omit the file extension for includegraphics, but this does not
+// work when the filename contains other dots.
+// Idea from http://www.tex.ac.uk/cgi-bin/texfaq2html?label=unkgrfextn
+string const lyxdot_def =
+       "%% A simple dot to overcome graphicx limitations\n"
+       "\\newcommand{\\lyxdot}{.}\n";
+
+
+} // namespace lyx