new \lyxline difinition, fixes also bug 1988:

[lyx.git] / src / lyx_sty.C

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index ed25658d3e06d81e16370426ba12227d57fbbafd..9e7d56fdbf4e525438c5c87235af49276325491b 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;
 
 
@@ -23,14 +26,14 @@ string const lyx_def =
        "\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}";
 
 string const lyxline_def =
-       "\\newcommand{\\lyxline}[1]{\n"
-       "  {#1 \\vspace{1ex} \\hrule width \\columnwidth \\vspace{1ex}}\n"
-       "}";
+       "\\newcommand{\\lyxline}[1][1pt]{%\n"
+       "  \\par\\noindent%\n"
+       "  \\rule[.5ex]{\\linewidth}{#1}\\par}";
 
 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