X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_sty.C;h=b529c5d3601300e04b4cd53759b26d7a063b33b7;hb=2b378ca3fdbd701b0d5e350e1c6b22155c07a2dc;hp=51272d30424db0924d140525da5d5a8c06833433;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git

diff --git a/src/lyx_sty.C b/src/lyx_sty.C
index 51272d3042..b529c5d360 100644
--- a/src/lyx_sty.C
+++ b/src/lyx_sty.C
@@ -1,26 +1,30 @@
-/*
-  This file is part of
-  ======================================================
-  
-  LyX, The Document Processor
-  
-  Copyright 1995 Matthias Ettrich
-  Copyright 1995-1999 The LyX Team.
-  ======================================================
-  */
+/**
+ * \file lyx_sty.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "lyx_sty.h"
 
+
+namespace lyx {
+
+using std::string;
+
+
 //\NeedsTeXFormat{LaTeX2e}
 //\ProvidesPackage{lyx}[1996/01/11 LLE v0.2 (LyX LaTeX Extensions)]
-//\message{LyX LaTeX Extensions (LLE v0.2) of 11-Jan-1996.} 
+//\message{LyX LaTeX Extensions (LLE v0.2) of 11-Jan-1996.}
 
-// include this always
 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"
@@ -28,14 +32,12 @@ string const lyxline_def =
 
 string const noun_def = "\\newcommand{\\noun}[1]{\\textsc{#1}}";
 
-string const lyxarrow_def = 
-      "\\newcommand{\\lyxarrow}{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}";
+string const lyxarrow_def =
+	"\\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).
 
-
-
 string const quotedblbase_def =
 	"\\ProvideTextCommandDefault{\\quotedblbase}{%\n"
 	"  \\raisebox{-1.4ex}[1ex][.5ex]{\\textquotedblright}%\n"
@@ -49,40 +51,42 @@ string const quotesinglbase_def =
 	"}";
 
 string const guillemotleft_def =
-        "\\ProvideTextCommandDefault{\\guillemotleft}{%\n"
-        "  {\\usefont{U}{lasy}{m}{n}\\char'50\\kern-.15em\\char'50}%\n"
-        "\\penalty10000\\hskip0pt\\relax%\n"
-        "}";
+	"\\ProvideTextCommandDefault{\\guillemotleft}{%\n"
+	"  {\\usefont{U}{lasy}{m}{n}\\char'50\\kern-.15em\\char'50}%\n"
+	"\\penalty10000\\hskip0pt\\relax%\n"
+	"}";
 
 string const guillemotright_def =
-        "\\ProvideTextCommandDefault{\\guillemotright}{%\n"
-        "  \\penalty10000\\hskip0pt%\n"
-        "  {\\usefont{U}{lasy}{m}{n}\\char'51\\kern-.15em\\char'51}%\n"
-        "}";
+	"\\ProvideTextCommandDefault{\\guillemotright}{%\n"
+	"  \\penalty10000\\hskip0pt%\n"
+	"  {\\usefont{U}{lasy}{m}{n}\\char'51\\kern-.15em\\char'51}%\n"
+	"}";
 
 string const guilsinglleft_def =
-        "\\ProvideTextCommandDefault{\\guilsinglleft}{%\n"
-        "  {\\usefont{U}{lasy}{m}{n}\\char'50}%\n"
-        "  \\penalty10000\\hskip0pt\\relax%\n"
-        "}";
+	"\\ProvideTextCommandDefault{\\guilsinglleft}{%\n"
+	"  {\\usefont{U}{lasy}{m}{n}\\char'50}%\n"
+	"  \\penalty10000\\hskip0pt\\relax%\n"
+	"}";
 
 string const guilsinglright_def =
-        "\\ProvideTextCommandDefault{\\guilsinglright}{%\n"
-        "  \\penalty10000\\hskip0pt%\n"
-        "  {\\usefont{U}{lasy}{m}{n}\\char'51}%\n"
-        "}";
+	"\\ProvideTextCommandDefault{\\guilsinglright}{%\n"
+	"  \\penalty10000\\hskip0pt%\n"
+	"  {\\usefont{U}{lasy}{m}{n}\\char'51}%\n"
+	"}";
 
-string const paragraphindent_def =
-	"\\newenvironment{LyXParagraphIndent}[1]%\n"
+string const paragraphleftindent_def =
+	"\\newenvironment{LyXParagraphLeftIndent}[1]%\n"
 	"{\n"
 	"  \\begin{list}{}{%\n"
-	"    \\setlength\\topsep{0pt}%\n"
+	"    \\setlength{\\topsep}{0pt}%\n"
 	"    \\addtolength{\\leftmargin}{#1}\n"
-// 	"%%    \\addtolength{\\leftmargin}{#1\\textwidth}\n"
-// 	"%%    \\setlength{\\textwidth}{#2\\textwidth}\n"
-// 	"%%    \\setlength\\listparindent\\parindent%\n"
-// 	"%%    \\setlength\\itemindent\\parindent%\n"
-	"    \\setlength\\parsep{0pt plus 1pt}%\n"
+// ho hum, yet more things commented out with no hint as to why they
+// weren't just removed
+//	"%%    \\addtolength{\\leftmargin}{#1\\textwidth}\n"
+//	"%%    \\setlength{\\textwidth}{#2\\textwidth}\n"
+//	"%%    \\setlength\\listparindent\\parindent%\n"
+//	"%%    \\setlength\\itemindent\\parindent%\n"
+	"    \\setlength{\\parsep}{0pt plus 1pt}%\n"
 	"  }\n"
 	"  \\item[]\n"
 	"}\n"
@@ -106,16 +110,32 @@ string const floatingfootnote_def =
 	"  \\expandafter\\noexpand\\csname SF@gobble@opt \\endcsname}\n"
 	"\\def\\SF@gobble@twobracket[#1]#2{}\n";
 
-string const minipageindent_def =
-	"%% This length is the backup for minipages of the \\parindent\n"
-	"\\newlength{\\LyXMinipageIndent}\n"
-	"\\setlength{\\LyXMinipageIndent}{\\parindent}\n";
-
 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"
 	"\\newcommand{\\binom}[2]{{#1 \\choose #2}}\n";
 
+string const mathcircumflex_def =
+	"%% For printing a cirumflex inside a formula\n"
+	"\\newcommand{\\mathcircumflex}[0]{\\mbox{\\^{}}}\n";
+
+string const tabularnewline_def =
+	"%% Because html converters don't know tabularnewline\n"
+	"\\providecommand{\\tabularnewline}{\\\\}\n";
+
+string const lyxgreyedout_def =
+	"%% The greyedout annotation environment\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