Buffer: Rename function names:

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index f4a84566304d3dbcd56570f8a5c33ad5176b9686..172dfdadca7363001753443f0f2d66be106f4ccf 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -38,6 +38,9 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <algorithm>
+
+
 using namespace std;
 using namespace lyx::support;
 
@@ -57,11 +60,6 @@ namespace lyx {
 static docstring const lyx_def = from_ascii(
        "\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
 
-static docstring const lyxline_def = from_ascii(
-       "\\newcommand{\\lyxline}[1][1pt]{%\n"
-       "  \\par\\noindent%\n"
-       "  \\rule[.5ex]{\\linewidth}{#1}\\par}");
-
 static docstring const noun_def = from_ascii(
        "\\newcommand{\\noun}[1]{\\textsc{#1}}");
 
@@ -195,13 +193,11 @@ static docstring const changetracking_none_def = from_ascii(
        "\\newcommand{\\lyxdeleted}[3]{}\n");
 
 static docstring const textgreek_def = from_ascii(
-       "\\providecommand*{\\perispomeni}{\\char126}\n"
-       "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
-       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
-       "  \\renewcommand{\\~}{\\perispomeni}%\n"
-       "}}\n"
+       "\\DeclareRobustCommand{\\greektext}{%\n"
+       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
        "\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
-       "\\DeclareFontEncoding{LGR}{}{}\n");
+       "\\DeclareFontEncoding{LGR}{}{}\n"
+       "\\DeclareTextSymbol{\\~}{LGR}{126}");
 
 static docstring const textcyr_def = from_ascii(
        "\\DeclareRobustCommand{\\cyrtext}{%\n"
@@ -260,6 +256,25 @@ static docstring const ogonek_def = from_ascii(
        "  \\mathchar\"0\\hexnumber@\\symtipasymb0C}{#2}}\n"
        "\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n");
 
+static docstring const lyxref_def = from_ascii(
+       "\\makeatletter\n"
+       "\\def\\lyxref#1{\\@lyxref#1:@@@@@:}\n"
+       "\\def\\@lyxref#1:#2:{%\n"
+       "\\ifthenelse{\\equal{#2}{@@@@@}}%\n"
+       "       {\\ref{#1}}%\n"
+       "       {\\@@lyxref#1:#2:}%\n"
+       "}\n"
+       "\\def\\@@lyxref#1:#2:@@@@@:{%\n"
+       "       \\RS@ifundefined{#1ref}%\n"
+       "       {\\ref{#1:#2}}%\n"
+       "       {\\RS@nameuse{#1ref}{#2}}%\n"
+       "}\n"
+       "\\RS@ifundefined{\thmref}\n"
+       "  {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n"
+       "  {}\n"
+       "\\makeatother\n"
+       );
+
 /////////////////////////////////////////////////////////////////////
 //
 // LaTeXFeatures
@@ -511,6 +526,7 @@ char const * simplefeatures[] = {
        // subfig is handled in BufferParams.cpp
        "varioref",
        "prettyref",
+       "refstyle",
        /*For a successful cooperation of the `wrapfig' package with the
          `float' package you should load the `wrapfig' package *after*
          the `float' package. See the caption package documentation
@@ -604,6 +620,13 @@ string const LaTeXFeatures::getColorOptions() const
                // the lyxgreyedout environment (see lyxgreyedout_def)
        }
 
+       // color for shaded boxes
+       if (isRequired("framed") && mustProvide("color")) {
+               colors << "\\definecolor{shadecolor}{rgb}{";
+               colors << outputLaTeXColor(params_.boxbgcolor) << "}\n";
+               // this color is automatically used by the LaTeX-package "framed"
+       }
+
        return colors.str();
 }
 
@@ -666,7 +689,8 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\usepackage{accents}\n";
 
        // mathdots must be loaded after amsmath
-       if (mustProvide("mathdots"))
+       if (mustProvide("mathdots") &&
+               params_.use_mathdots != BufferParams::package_off)
                packages << "\\usepackage{mathdots}\n";
 
        // yhmath must be loaded after amsmath
@@ -693,21 +717,7 @@ string const LaTeXFeatures::getPackages() const
                                 << params_.graphicsDriver
                                 << "]{graphicx}\n";
        }
-       // shadecolor for shaded
-       if (isRequired("framed") && mustProvide("color")) {
-               RGBColor c = rgbFromHexName(lcolor.getX11Name(Color_shadedbg));
-               //255.0 to force conversion to double
-               //NOTE As Jürgen Spitzmüller pointed out, an alternative would be
-               //to use the xcolor package instead, and then we can do
-               // \define{shadcolor}{RGB}...
-               //and not do any conversion. We'd then need to require xcolor
-               //in InsetNote::validate().
-               int const stmSize = packages.precision(2);
-               packages << "\\definecolor{shadecolor}{rgb}{"
-                       << c.r / 255.0 << ',' << c.g / 255.0 << ',' << c.b / 255.0 << "}\n";
-               packages.precision(stmSize);
-       }
-
+       
        // lyxskak.sty --- newer chess support based on skak.sty
        if (mustProvide("chess"))
                packages << "\\usepackage[ps,mover]{lyxskak}\n";
@@ -756,6 +766,9 @@ string const LaTeXFeatures::getPackages() const
        if (mustProvide("xy"))
                packages << "\\usepackage[all]{xy}\n";
 
+       if (mustProvide("feyn"))
+               packages << "\\usepackage{feyn}\n"; //Diagram
+
        if (mustProvide("ulem"))
                packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
                            "\\usepackage{ulem}\n";
@@ -810,9 +823,6 @@ docstring const LaTeXFeatures::getMacros() const
        if (mustProvide("LyX"))
                macros << lyx_def << '\n';
 
-       if (mustProvide("lyxline"))
-               macros << lyxline_def << '\n';
-
        if (mustProvide("noun"))
                macros << noun_def << '\n';
 
@@ -910,6 +920,9 @@ docstring const LaTeXFeatures::getMacros() const
 
        // floats
        getFloatDefinitions(macros);
+       
+       if (mustProvide("refstyle"))
+               macros << lyxref_def << '\n';
 
        // change tracking
        if (mustProvide("ct-dvipost"))
@@ -1121,7 +1134,7 @@ docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
             fi != end; ++fi)
                // FIXME UNICODE
                sgmlpreamble << "\n<!ENTITY " << fi->first
-                            << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+                            << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
                             << makeRelPath(from_utf8(fi->second), basename) << "\">";
 
        return sgmlpreamble.str();