X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_sty.C;h=b529c5d3601300e04b4cd53759b26d7a063b33b7;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=4c9f42af7bd9d115be291749282871663d547bc9;hpb=038032fefdd878a5d172b983269f5ffe84c640a9;p=lyx.git

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index 4c9f42af7b..b529c5d360 100644
--- 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).
@@ -75,7 +78,7 @@ string const paragraphleftindent_def =
 	"\\newenvironment{LyXParagraphLeftIndent}[1]%\n"
 	"{\n"
 	"  \\begin{list}{}{%\n"
-	"    \\setlength\\topsep{0pt}%\n"
+	"    \\setlength{\\topsep}{0pt}%\n"
 	"    \\addtolength{\\leftmargin}{#1}\n"
 // ho hum, yet more things commented out with no hint as to why they
 // weren't just removed
@@ -83,7 +86,7 @@ string const paragraphleftindent_def =
 //	"%%    \\setlength{\\textwidth}{#2\\textwidth}\n"
 //	"%%    \\setlength\\listparindent\\parindent%\n"
 //	"%%    \\setlength\\itemindent\\parindent%\n"
-	"    \\setlength\\parsep{0pt plus 1pt}%\n"
+	"    \\setlength{\\parsep}{0pt plus 1pt}%\n"
 	"  }\n"
 	"  \\item[]\n"
 	"}\n"
@@ -109,7 +112,7 @@ string const floatingfootnote_def =
 
 string const boldsymbol_def =
 	"%% Bold symbol macro for standard LaTeX users\n"
-	"\\newcommand{\\boldsymbol}[1]{\\mbox{\\boldmath $#1$}}\n";
+	"\\providecommand{\\boldsymbol}[1]{\\mbox{\\boldmath $#1$}}\n";
 
 string const binom_def =
 	"%% Binom macro for standard LaTeX users\n"
@@ -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