X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_sty.C;h=b529c5d3601300e04b4cd53759b26d7a063b33b7;hb=2b378ca3fdbd701b0d5e350e1c6b22155c07a2dc;hp=ed25658d3e06d81e16370426ba12227d57fbbafd;hpb=7f68b94d8a7fba6942890b7733403192b98b040a;p=lyx.git diff --git a/src/lyx_sty.C b/src/lyx_sty.C index ed25658d3e..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" @@ -125,7 +128,7 @@ 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. @@ -133,3 +136,6 @@ string const lyxgreyedout_def = string const lyxdot_def = "%% A simple dot to overcome graphicx limitations\n" "\\newcommand{\\lyxdot}{.}\n"; + + +} // namespace lyx