]> git.lyx.org Git - lyx.git/blobdiff - src/LaTeXFeatures.cpp
Treat math style a bit more like other font features
[lyx.git] / src / LaTeXFeatures.cpp
index 5f83283460ddd320ffaa095e5db42d52660c3957..d88978128910d42c28ce6b82dc956227846c9909 100644 (file)
@@ -63,16 +63,7 @@ namespace lyx {
 //\message{LyX LaTeX Extensions (LLE v0.2) of 11-Jan-1996.}
 
 static docstring const lyx_def = from_ascii(
-       "\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
-
-static docstring const lyx_rtl_def = from_ascii(
-       "\\let\\@@LyX\\LyX\n"
-       "\\def\\LyX{\\@ensure@LTR{\\@@LyX}}");
-
-static docstring const lyx_hyperref_def = from_ascii(
-       "\\providecommand{\\LyX}{\\texorpdfstring%\n"
-       "  {L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}\n"
-       "  {LyX}}");
+       "{%\n  L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
 
 static docstring const noun_def = from_ascii(
        "\\newcommand{\\noun}[1]{\\textsc{#1}}");
@@ -324,67 +315,67 @@ static docstring const ogonek_def = from_ascii(
 
 static docstring const lyxaccent_def = from_ascii(
        "%% custom text accent \\LyxTextAccent[<rise value (length)>]{<accent>}{<base>}\n"
-        "\\newcommand*{\\LyxTextAccent}[3][0ex]{%\n"
-        "  \\hmode@bgroup\\ooalign{\\null#3\\crcr\\hidewidth\n"
-        "  \\raise#1\\hbox{#2}\\hidewidth}\\egroup}\n"
-        "%% select a font size smaller than the current font size:\n"
-        "\\newcommand{\\LyxAccentSize}[1][\\sf@size]{%\n"
-        "  \\check@mathfonts\\fontsize#1\\z@\\math@fontsfalse\\selectfont\n"
-        "}\n");
+       "\\newcommand*{\\LyxTextAccent}[3][0ex]{%\n"
+       "  \\hmode@bgroup\\ooalign{\\null#3\\crcr\\hidewidth\n"
+       "  \\raise#1\\hbox{#2}\\hidewidth}\\egroup}\n"
+       "%% select a font size smaller than the current font size:\n"
+       "\\newcommand{\\LyxAccentSize}[1][\\sf@size]{%\n"
+       "  \\check@mathfonts\\fontsize#1\\z@\\math@fontsfalse\\selectfont\n"
+       "}\n");
 
 static docstring const textcommabelow_def = from_ascii(
-        "\\ProvideTextCommandDefault{\\textcommabelow}[1]{%%\n"
-        "  \\LyxTextAccent[-.31ex]{\\LyxAccentSize,}{#1}}\n");
+       "\\ProvideTextCommandDefault{\\textcommabelow}[1]{%%\n"
+       "  \\LyxTextAccent[-.31ex]{\\LyxAccentSize,}{#1}}\n");
 
 static docstring const textcommaabove_def = from_ascii(
-        "\\ProvideTextCommandDefault{\\textcommaabove}[1]{%%\n"
-        "  \\LyxTextAccent[.5ex]{\\LyxAccentSize`}{#1}}\n");
+       "\\ProvideTextCommandDefault{\\textcommaabove}[1]{%%\n"
+       "  \\LyxTextAccent[.5ex]{\\LyxAccentSize`}{#1}}\n");
 
 static docstring const textcommaaboveright_def = from_ascii(
-        "\\ProvideTextCommandDefault{\\textcommaaboveright}[1]{%%\n"
-        "  \\LyxTextAccent[.5ex]{\\LyxAccentSize\\ '}{#1}}\n");
+       "\\ProvideTextCommandDefault{\\textcommaaboveright}[1]{%%\n"
+       "  \\LyxTextAccent[.5ex]{\\LyxAccentSize\\ '}{#1}}\n");
 
 // Baltic languages use a comma-accent instead of a cedilla
 static docstring const textbaltic_def = from_ascii(
-        "%% use comma accent instead of cedilla for these characters:\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{g}{\\textcommaabove{g}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{G}{\\textcommabelow{G}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{k}{\\textcommabelow{k}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{K}{\\textcommabelow{K}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{l}{\\textcommabelow{l}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{L}{\\textcommabelow{L}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{n}{\\textcommabelow{n}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{N}{\\textcommabelow{N}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{r}{\\textcommabelow{r}}\n"
-        "\\DeclareTextCompositeCommand{\\c}{T1}{R}{\\textcommabelow{R}}\n");
+       "%% use comma accent instead of cedilla for these characters:\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{g}{\\textcommaabove{g}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{G}{\\textcommabelow{G}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{k}{\\textcommabelow{k}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{K}{\\textcommabelow{K}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{l}{\\textcommabelow{l}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{L}{\\textcommabelow{L}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{n}{\\textcommabelow{n}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{N}{\\textcommabelow{N}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{r}{\\textcommabelow{r}}\n"
+       "\\DeclareTextCompositeCommand{\\c}{T1}{R}{\\textcommabelow{R}}\n");
 
 // split-level fractions
 static docstring const xfrac_def = from_ascii(
           "\\usepackage{xfrac}\n");
 static docstring const smallLetterFrac_def = from_ascii(
-        "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n"
-               "  {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n"
-               "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmr}{text}\n"
-               "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
-               "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmss}{text}\n"
-               "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
-               "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmr}{text}\n"
-               "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
-               "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmss}{text}\n"
-               "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
-               "\\newcommand{\\smallLetterFrac}[2]{%\n"
-               "  {\\UseCollection{xfrac}{smallLetterFrac}\\sfrac{#1}{#2}}}\n");
+       "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n"
+       "  {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n"
+       "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmr}{text}\n"
+       "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+       "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmss}{text}\n"
+       "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+       "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmr}{text}\n"
+       "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+       "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmss}{text}\n"
+       "  {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
+       "\\newcommand{\\smallLetterFrac}[2]{%\n"
+       "  {\\UseCollection{xfrac}{smallLetterFrac}\\sfrac{#1}{#2}}}\n");
 
 static docstring const lyxref_def = from_ascii(
-               "\\RS@ifundefined{subsecref}\n"
-               "  {\\newref{subsec}{name = \\RSsectxt}}\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");
+       "\\RS@ifundefined{subsecref}\n"
+       "  {\\newref{subsec}{name = \\RSsectxt}}\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");
 
 // Make sure the columns are also outputed as rtl
 static docstring const rtloutputdblcol_def = from_ascii(
@@ -463,7 +454,7 @@ static docstring const lyxstrikeout_style = from_ascii(
 
 
 LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
-                            OutputParams const & r)
+                                                        OutputParams const & r)
        : buffer_(&b), params_(p), runparams_(r), in_float_(false),
          in_deleted_inset_(false)
 {}
@@ -929,6 +920,7 @@ bool LaTeXFeatures::hasRTLLanguage() const
        return false;
 }
 
+
 namespace {
 
 char const * simplefeatures[] = {
@@ -958,8 +950,7 @@ char const * simplefeatures[] = {
        "units",
        "framed",
        "soul",
-       "textcomp",
-       "pmboxdraw",
+       "dingbat",
        "bbding",
        "ifsym",
        "txfonts",
@@ -971,7 +962,6 @@ char const * simplefeatures[] = {
        // "cancel",
        "ascii",
        "url",
-       "covington",
        "csquotes",
        "enumitem",
        "endnotes",
@@ -996,11 +986,12 @@ char const * simplefeatures[] = {
        "todonotes",
        "forest",
        "varwidth",
-       "footnote",
        "tablefootnote",
        "afterpage",
        "tabularx",
-       "xltabular"
+       "xltabular",
+       "chessboard",
+       "xskak"
 };
 
 char const * bibliofeatures[] = {
@@ -1123,6 +1114,13 @@ string const LaTeXFeatures::getPackages() const
        // The rest of these packages are somewhat more complicated
        // than those above.
 
+       if (mustProvide("footnote")) {
+               if (isRequired("hyperref"))
+                       packages << "\\usepackage{footnotehyper}\n";
+               else
+                       packages << "\\usepackage{footnote}\n";
+       }
+
        // [pdf]lscape is used to rotate longtables
        if (mustProvide("lscape")) {
                if (runparams_.flavor == OutputParams::LATEX
@@ -1374,12 +1372,24 @@ TexString LaTeXFeatures::getMacros() const
        }
 
        if (mustProvide("LyX")) {
+               macros << "\\providecommand{\\LyX}";
+               // open conditional wrappers
+               if (runparams_.use_polyglossia && hasRTLLanguage())
+                       macros << "{\\@ensure@LTR";
                if (isRequired("hyperref"))
-                       macros << lyx_hyperref_def << '\n';
-               else
-                       macros << lyx_def << '\n';
+                       macros << "{\\texorpdfstring";
+               if (useBabel())
+                       macros << "{\\textlatin";
+               // main definition
+               macros << lyx_def;
+               // close conditional wrappers
+               if (useBabel())
+                       macros << '}';
+               if (isRequired("hyperref"))
+                       macros << "{LyX}}";
                if (runparams_.use_polyglossia && hasRTLLanguage())
-                       macros << lyx_rtl_def << '\n';
+                       macros << '}';
+               macros << '\n';
        }
 
        if (mustProvide("noun"))