X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=827b44992fba64cc526bdf47432a4dd1579369ff;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=76dc31c0eca247e8e4f29809e6886267f7371710;hpb=7a17610a0041b09785d12759a3eaf2988f67c935;p=lyx.git diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 76dc31c0ec..827b44992f 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -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[]{}{}\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) {} @@ -756,7 +747,7 @@ void LaTeXFeatures::useLanguage(Language const * lang) // They use the CJK package if (lang->encoding()->package() == Encoding::CJK) require("CJK"); - // japanese package is special + // japanese babel language is special (tied to the pLaTeX engine). if (lang->encoding()->package() == Encoding::japanese) require("japanese"); } @@ -888,8 +879,7 @@ set LaTeXFeatures::getEncodingSet(string const & doc_encoding) const set encs; for (auto const & lang : UsedLanguages_) if (lang->encoding()->latexName() != doc_encoding && - (lang->encoding()->package() == Encoding::inputenc - || lang->encoding()->package() == Encoding::japanese)) + lang->encoding()->package() == Encoding::inputenc) encs.insert(lang->encoding()->latexName()); return encs; } @@ -929,6 +919,7 @@ bool LaTeXFeatures::hasRTLLanguage() const return false; } + namespace { char const * simplefeatures[] = { @@ -1380,12 +1371,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 << "{\\ensureascii"; + // 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")) @@ -1600,21 +1603,6 @@ docstring const LaTeXFeatures::getBabelPostsettings() const } -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; -} - - string const LaTeXFeatures::loadAMSPackages() const { ostringstream tmp; @@ -1910,9 +1898,11 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, // encodings, only with fixed width encodings. Therefore we // need to force a fixed width encoding for // \lstlistlistingname and \lstlistingname (bug 9382). - // This needs to be consistent with InsetListings::latex(). + // This needs to be consistent with InsetListings::latex() + // rsp. InsetListings::forcedEncoding(). bool const need_fixedwidth = !use_minted && !runparams_.isFullUnicode() && + buffer().params().encoding().package() != Encoding::japanese && it->second.fixedwidthpreambleencoding(); // language dependent commands (once per document) snippets.insert(i18npreamble(it->second.langpreamble(),