Output end of math environments at the beginning of a new line,

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index c9216c6042b93514f181cc05e600d06839ac0927..8820e1c412bca088e5654ab6645523ba2b161217 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -60,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}}");
 
@@ -261,6 +256,18 @@ 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(
+               "\\RS@ifundefined{subref}\n"
+               "  {\\def\\RSsubtxt{section~}\\newref{sub}{name = \\RSsubtxt}}\n" 
+               "  {}\n"
+               "\\RS@ifundefined{thmref}\n"
+               "  {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n" 
+               "  {}\n"
+               "\\RS@ifundefined{lemref}\n"
+               "  {\\def\\RSlemtxt{lemma~}\\newref{lem}{name = \\RSlemtxt}}\n" 
+               "  {}\n");
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // LaTeXFeatures
@@ -512,6 +519,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
@@ -751,6 +759,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";
@@ -805,9 +816,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';
 
@@ -905,13 +913,16 @@ docstring const LaTeXFeatures::getMacros() const
 
        // floats
        getFloatDefinitions(macros);
-
+       
+       if (mustProvide("refstyle")) 
+               macros << lyxref_def << '\n';   
+       
        // change tracking
        if (mustProvide("ct-dvipost"))
                macros << changetracking_dvipost_def;
-
+       
        if (mustProvide("ct-xcolor-ulem")) {
-               int const prec = macros.precision(2);
+               streamsize const prec = macros.precision(2);
        
                RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
                macros << "\\providecolor{lyxadded}{rgb}{"
@@ -936,22 +947,53 @@ docstring const LaTeXFeatures::getMacros() const
 }
 
 
-string const LaTeXFeatures::getBabelOptions() const
+string const LaTeXFeatures::getBabelPresettings() const
 {
        ostringstream tmp;
 
        LanguageList::const_iterator it  = UsedLanguages_.begin();
-       LanguageList::const_iterator end =  UsedLanguages_.end();
+       LanguageList::const_iterator end = UsedLanguages_.end();
        for (; it != end; ++it)
-               if (!(*it)->latex_options().empty())
-                       tmp << (*it)->latex_options() << '\n';
-       if (!params_.language->latex_options().empty())
-               tmp << params_.language->latex_options() << '\n';
+               if (!(*it)->babel_presettings().empty())
+                       tmp << (*it)->babel_presettings() << '\n';
+       if (!params_.language->babel_presettings().empty())
+               tmp << params_.language->babel_presettings() << '\n';
 
        return tmp.str();
 }
 
 
+string const LaTeXFeatures::getBabelPostsettings() const
+{
+       ostringstream tmp;
+
+       LanguageList::const_iterator it  = UsedLanguages_.begin();
+       LanguageList::const_iterator end = UsedLanguages_.end();
+       for (; it != end; ++it)
+               if (!(*it)->babel_postsettings().empty())
+                       tmp << (*it)->babel_postsettings() << '\n';
+       if (!params_.language->babel_postsettings().empty())
+               tmp << params_.language->babel_postsettings() << '\n';
+
+       return tmp.str();
+}
+
+
+bool LaTeXFeatures::needBabelLangOptions() const
+{
+       if (!lyxrc.language_global_options || params_.language->asBabelOptions())
+               return true;
+
+       LanguageList::const_iterator it  = UsedLanguages_.begin();
+       LanguageList::const_iterator end = UsedLanguages_.end();
+       for (; it != end; ++it)
+               if ((*it)->asBabelOptions())
+                       return true;
+
+       return false;
+}
+
+
 docstring const LaTeXFeatures::getTClassPreamble() const
 {
        // the text class specific preamble