Fix bug 4441. GuiRef: Ok button must be default.

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index fc3ef3c6bc214dd7a830ee4ff8078fa3e12a7970..99a7d811ef8baec3a7a436aca45e643f4a2ccfa0 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -16,8 +16,9 @@
 
 #include "LaTeXFeatures.h"
 
-#include "Color.h"
+#include "Buffer.h"
 #include "BufferParams.h"
+#include "ColorSet.h"
 #include "Encoding.h"
 #include "Floating.h"
 #include "FloatList.h"
@@ -60,7 +61,10 @@ static string const lyxline_def =
 static string const noun_def = "\\newcommand{\\noun}[1]{\\textsc{#1}}";
 
 static string const lyxarrow_def =
-       "\\newcommand{\\lyxarrow}{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}";
+       "\\DeclareRobustCommand*{\\lyxarrow}{%\n"
+       "\\@ifstar\n"
+       "{\\leavevmode\\,$\\triangleleft$\\,\\allowbreak}\n"
+       "{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}";
 
 // for quotes without babel. This does not give perfect results, but
 // anybody serious about non-english quotes should use babel (JMarc).
@@ -171,15 +175,15 @@ static string const changetracking_dvipost_def =
        "\\newcommand{\\lyxdeleted}[3]{%\n"
        "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n";
 
-static string const changetracking_xcolor_soul_def =
-       "%% Change tracking with soul\n"
+static string const changetracking_xcolor_ulem_def =
+       "%% Change tracking with ulem\n"
        "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n"
-       "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\st{#3}}}\n";
+       "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n";
 
-static string const changetracking_xcolor_soul_hyperref_def =
-       "%% Change tracking with soul\n"
+static string const changetracking_xcolor_ulem_hyperref_def =
+       "%% Change tracking with ulem\n"
        "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}}{}#3}}\n"
-       "\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\st{#3}}{}}}\n";
+       "\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n";
 
 static string const changetracking_none_def =
        "\\newcommand{\\lyxadded}[3]{#3}\n"
@@ -198,11 +202,9 @@ static string const textcyr_def =
        "\\AtBeginDocument{\\DeclareFontEncoding{T2A}{}{}}\n";
 
 static string const lyxmathsym_def =
-       "\\DeclareRobustCommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n"
-       "  \\def\\rmorbf##1{\\ifx\\math@version\\b@ld\\textbf{##1}\\else\\textrm{##1}\\fi}\n"
-       "  \\mathchoice{\\hbox{\\rmorbf{#1}}}{\\hbox{\\rmorbf{#1}}}\n"
-       "  {\\hbox{\\smaller[2]\\rmorbf{#1}}}{\\hbox{\\smaller[3]\\rmorbf{#1}}}\n"
-       "  \\endgroup\\else#1\\fi}\n";
+       "\\newcommand{\\lyxmathsym}{\\@ifstar{\\lyxm@thsym\\textit}{\\lyxm@thsym\\textrm}}\n"
+       "\\newcommand{\\lyxm@thsym}[2]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n"
+       "  #1{\\ifx\\math@version\\b@ld\\bfseries\\fi#2}\\endgroup\\else#2\\fi}\n";
 
 static string const papersizedvi_def =
        "\\special{papersize=\\the\\paperwidth,\\the\\paperheight}\n";
@@ -262,7 +264,7 @@ LaTeXFeatures::Packages LaTeXFeatures::packages_;
 
 LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
                             OutputParams const & r)
-       : buffer_(&b), params_(p), runparams_(r)
+       : buffer_(&b), params_(p), runparams_(r), in_float_(false)
 {}
 
 
@@ -510,7 +512,6 @@ char const * simplefeatures[] = {
        // listings is handled in BufferParams.cpp
        "bm",
        "pdfpages",
-       "relsize",
        "amscd",
        "slashed"
 };
@@ -582,9 +583,12 @@ string const LaTeXFeatures::getPackages() const
                && params_.use_esint == BufferParams::package_off
                && params_.use_amsmath != BufferParams::package_off)) {
                packages << "\\usepackage{amsmath}\n";
-       } else if (mustProvide("amsbsy")) {
-               // amsbsy is already provided by amsmath
-               packages << "\\usepackage{amsbsy}\n";
+       } else {
+               // amsbsy and amstext are already provided by amsmath
+               if (mustProvide("amsbsy"))
+                       packages << "\\usepackage{amsbsy}\n";
+               if (mustProvide("amstext"))
+                       packages << "\\usepackage{amstext}\n";
        }
        
        // wasysym is a simple feature, but it must be after amsmath if both
@@ -684,6 +688,10 @@ string const LaTeXFeatures::getPackages() const
        if (mustProvide("xy"))
                packages << "\\usepackage[all]{xy}\n";
 
+       if (mustProvide("ulem"))
+               packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
+                           "\\usepackage{ulem}\n";
+
        if (mustProvide("nomencl")) {
                // Make it work with the new and old version of the package,
                // but don't use the compatibility option since it is
@@ -812,7 +820,7 @@ string const LaTeXFeatures::getMacros() const
        if (mustProvide("ct-dvipost"))
                macros << changetracking_dvipost_def;
 
-       if (mustProvide("ct-xcolor-soul")) {
+       if (mustProvide("ct-xcolor-ulem")) {
                int const prec = macros.precision(2);
        
                RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
@@ -826,9 +834,9 @@ string const LaTeXFeatures::getMacros() const
                macros.precision(prec);
                
                if (isRequired("hyperref"))
-                       macros << changetracking_xcolor_soul_hyperref_def;
+                       macros << changetracking_xcolor_ulem_hyperref_def;
                else
-                       macros << changetracking_xcolor_soul_def;
+                       macros << changetracking_xcolor_ulem_def;
        }
 
        if (mustProvide("ct-none"))
@@ -864,10 +872,40 @@ docstring const LaTeXFeatures::getTClassPreamble() const
 
        list<docstring>::const_iterator cit = usedLayouts_.begin();
        list<docstring>::const_iterator end = usedLayouts_.end();
-       for (; cit != end; ++cit) {
+       for (; cit != end; ++cit)
                tcpreamble << tclass[*cit].preamble();
+
+       return tcpreamble.str();
+}
+
+
+docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const
+{
+       DocumentClass const & tclass = params_.documentClass();
+       // collect preamble snippets in a set to prevent multiple identical
+       // commands (would happen if e.g. both theorem and theorem* are used)
+       set<docstring> snippets;
+       typedef LanguageList::const_iterator lang_it;
+       lang_it const lbeg = UsedLanguages_.begin();
+       lang_it const lend =  UsedLanguages_.end();
+       list<docstring>::const_iterator cit = usedLayouts_.begin();
+       list<docstring>::const_iterator end = usedLayouts_.end();
+       for (; cit != end; ++cit) {
+               // language dependent commands (once per document)
+               snippets.insert(tclass[*cit].langpreamble(buffer().language()));
+               // commands for language changing (for multilanguage documents)
+               if (use_babel && !UsedLanguages_.empty()) {
+                       snippets.insert(tclass[*cit].babelpreamble(buffer().language()));
+                       for (lang_it lit = lbeg; lit != lend; ++lit)
+                               snippets.insert(tclass[*cit].babelpreamble(*lit));
+               }
        }
 
+       odocstringstream tcpreamble;
+       set<docstring>::const_iterator const send = snippets.end();
+       set<docstring>::const_iterator it = snippets.begin();
+       for (; it != send; ++it)
+               tcpreamble << *it;
        return tcpreamble.str();
 }