X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=1629186280413fe8ba5d87bcd18f183f107ed095;hb=489b80aef4d7904d667aeb06a32f2cc4ecbb75fa;hp=e64eb85cf1ace517ba7c579815b75d1b55a8fb45;hpb=658457b8474fcef68cc385ab7e3e88ca19b60aac;p=lyx.git diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index e64eb85cf1..1629186280 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -35,6 +35,7 @@ #include "support/docstream.h" #include "support/FileName.h" #include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" using namespace std; @@ -53,62 +54,63 @@ namespace lyx { //\ProvidesPackage{lyx}[1996/01/11 LLE v0.2 (LyX LaTeX Extensions)] //\message{LyX LaTeX Extensions (LLE v0.2) of 11-Jan-1996.} -static string const lyx_def = - "\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}"; +static docstring const lyx_def = from_ascii( + "\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}"); -static string const lyxline_def = +static docstring const lyxline_def = from_ascii( "\\newcommand{\\lyxline}[1][1pt]{%\n" " \\par\\noindent%\n" - " \\rule[.5ex]{\\linewidth}{#1}\\par}"; + " \\rule[.5ex]{\\linewidth}{#1}\\par}"); -static string const noun_def = "\\newcommand{\\noun}[1]{\\textsc{#1}}"; +static docstring const noun_def = from_ascii( + "\\newcommand{\\noun}[1]{\\textsc{#1}}"); -static string const lyxarrow_def = +static docstring const lyxarrow_def = from_ascii( "\\DeclareRobustCommand*{\\lyxarrow}{%\n" "\\@ifstar\n" "{\\leavevmode\\,$\\triangleleft$\\,\\allowbreak}\n" - "{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}"; + "{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}"); // for quotes without babel. This does not give perfect results, but // anybody serious about non-english quotes should use babel (JMarc). -static string const quotedblbase_def = +static docstring const quotedblbase_def = from_ascii( "\\ProvideTextCommandDefault{\\quotedblbase}{%\n" " \\raisebox{-1.4ex}[1ex][.5ex]{\\textquotedblright}%\n" " \\penalty10000\\hskip0em\\relax%\n" - "}"; + "}"); -static string const quotesinglbase_def = +static docstring const quotesinglbase_def = from_ascii( "\\ProvideTextCommandDefault{\\quotesinglbase}{%\n" " \\raisebox{-1.4ex}[1ex][.5ex]{\\textquoteright}%\n" " \\penalty10000\\hskip0em\\relax%\n" - "}"; + "}"); -static string const guillemotleft_def = +static docstring const guillemotleft_def = from_ascii( "\\ProvideTextCommandDefault{\\guillemotleft}{%\n" " {\\usefont{U}{lasy}{m}{n}\\char'50\\kern-.15em\\char'50}%\n" "\\penalty10000\\hskip0pt\\relax%\n" - "}"; + "}"); -static string const guillemotright_def = +static docstring const guillemotright_def = from_ascii( "\\ProvideTextCommandDefault{\\guillemotright}{%\n" " \\penalty10000\\hskip0pt%\n" " {\\usefont{U}{lasy}{m}{n}\\char'51\\kern-.15em\\char'51}%\n" - "}"; + "}"); -static string const guilsinglleft_def = +static docstring const guilsinglleft_def = from_ascii( "\\ProvideTextCommandDefault{\\guilsinglleft}{%\n" " {\\usefont{U}{lasy}{m}{n}\\char'50}%\n" " \\penalty10000\\hskip0pt\\relax%\n" - "}"; + "}"); -static string const guilsinglright_def = +static docstring const guilsinglright_def = from_ascii( "\\ProvideTextCommandDefault{\\guilsinglright}{%\n" " \\penalty10000\\hskip0pt%\n" " {\\usefont{U}{lasy}{m}{n}\\char'51}%\n" - "}"; + "}"); -static string const paragraphleftindent_def = +static docstring const paragraphleftindent_def = from_ascii( "\\newenvironment{LyXParagraphLeftIndent}[1]%\n" "{\n" " \\begin{list}{}{%\n" @@ -124,9 +126,9 @@ static string const paragraphleftindent_def = " }\n" " \\item[]\n" "}\n" - "{\\end{list}}\n"; + "{\\end{list}}\n"); -static string const floatingfootnote_def = +static docstring const floatingfootnote_def = from_ascii( "%% Special footnote code from the package 'stblftnt.sty'\n" "%% Author: Robin Fairbairns -- Last revised Dec 13 1996\n" "\\let\\SF@@footnote\\footnote\n" @@ -142,32 +144,32 @@ static string const floatingfootnote_def = "}\n" "\\edef\\SF@gobble@opt{\\noexpand\\protect\n" " \\expandafter\\noexpand\\csname SF@gobble@opt \\endcsname}\n" - "\\def\\SF@gobble@twobracket[#1]#2{}\n"; + "\\def\\SF@gobble@twobracket[#1]#2{}\n"); -static string const binom_def = +static docstring const binom_def = from_ascii( "%% Binom macro for standard LaTeX users\n" - "\\newcommand{\\binom}[2]{{#1 \\choose #2}}\n"; + "\\newcommand{\\binom}[2]{{#1 \\choose #2}}\n"); -static string const mathcircumflex_def = +static docstring const mathcircumflex_def = from_ascii( "%% For printing a cirumflex inside a formula\n" - "\\newcommand{\\mathcircumflex}[0]{\\mbox{\\^{}}}\n"; + "\\newcommand{\\mathcircumflex}[0]{\\mbox{\\^{}}}\n"); -static string const tabularnewline_def = +static docstring const tabularnewline_def = from_ascii( "%% Because html converters don't know tabularnewline\n" - "\\providecommand{\\tabularnewline}{\\\\}\n"; + "\\providecommand{\\tabularnewline}{\\\\}\n"); -static string const lyxgreyedout_def = +static docstring const lyxgreyedout_def = from_ascii( "%% The greyedout annotation environment\n" - "\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n"; + "\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n"); // We want to omit the file extension for includegraphics, but this does not // work when the filename contains other dots. // Idea from http://www.tex.ac.uk/cgi-bin/texfaq2html?label=unkgrfextn -static string const lyxdot_def = +static docstring const lyxdot_def = from_ascii( "%% A simple dot to overcome graphicx limitations\n" - "\\newcommand{\\lyxdot}{.}\n"; + "\\newcommand{\\lyxdot}{.}\n"); -static string const changetracking_dvipost_def = +static docstring const changetracking_dvipost_def = from_ascii( "%% Change tracking with dvipost\n" "\\dvipostlayout\n" "\\dvipost{osstart color push Red}\n" @@ -176,84 +178,87 @@ static string const changetracking_dvipost_def = "\\dvipost{cbend color pop}\n" "\\newcommand{\\lyxadded}[3]{\\changestart#3\\changeend}\n" "\\newcommand{\\lyxdeleted}[3]{%\n" - "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n"; + "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n"); -static string const changetracking_xcolor_ulem_def = +static docstring const changetracking_xcolor_ulem_def = from_ascii( "%% Change tracking with ulem\n" - "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n" - "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n"; + "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}{}#3}}\n" + "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n"); -static string const changetracking_xcolor_ulem_hyperref_def = +static docstring const changetracking_xcolor_ulem_hyperref_def = from_ascii( "%% Change tracking with ulem\n" - "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}}{}#3}}\n" - "\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n"; + "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}{}}{}#3}}\n" + "\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n"); -static string const changetracking_none_def = +static docstring const changetracking_none_def = from_ascii( "\\newcommand{\\lyxadded}[3]{#3}\n" - "\\newcommand{\\lyxdeleted}[3]{}\n"; - -static string const textgreek_def = - "\\DeclareRobustCommand{\\greektext}{%\n" - " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n" + "\\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{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n" - "\\DeclareFontEncoding{LGR}{}{}\n"; + "\\DeclareFontEncoding{LGR}{}{}\n"); -static string const textcyr_def = +static docstring const textcyr_def = from_ascii( "\\DeclareRobustCommand{\\cyrtext}{%\n" " \\fontencoding{T2A}\\selectfont\\def\\encodingdefault{T2A}}\n" "\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n" - "\\AtBeginDocument{\\DeclareFontEncoding{T2A}{}{}}\n"; + "\\AtBeginDocument{\\DeclareFontEncoding{T2A}{}{}}\n"); -static string const lyxmathsym_def = +static docstring const lyxmathsym_def = from_ascii( "\\newcommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n" - " \\text{\\ifx\\math@version\\b@ld\\bfseries\\fi#1}\\endgroup\\else#1\\fi}\n"; + " \\text{\\ifx\\math@version\\b@ld\\bfseries\\fi#1}\\endgroup\\else#1\\fi}\n"); -static string const papersizedvi_def = - "\\special{papersize=\\the\\paperwidth,\\the\\paperheight}\n"; +static docstring const papersizedvi_def = from_ascii( + "\\special{papersize=\\the\\paperwidth,\\the\\paperheight}\n"); -static string const papersizepdf_def = +static docstring const papersizepdf_def = from_ascii( "\\pdfpageheight\\paperheight\n" - "\\pdfpagewidth\\paperwidth\n"; + "\\pdfpagewidth\\paperwidth\n"); -static string const cedilla_def = +static docstring const cedilla_def = from_ascii( "\\newcommand{\\docedilla}[2]{\\underaccent{#1\\mathchar'30}{#2}}\n" - "\\newcommand{\\cedilla}[1]{\\mathpalette\\docedilla{#1}}\n"; + "\\newcommand{\\cedilla}[1]{\\mathpalette\\docedilla{#1}}\n"); -static string const subring_def = +static docstring const subring_def = from_ascii( "\\newcommand{\\dosubring}[2]{\\underaccent{#1\\mathchar'27}{#2}}\n" - "\\newcommand{\\subring}[1]{\\mathpalette\\dosubring{#1}}\n"; + "\\newcommand{\\subring}[1]{\\mathpalette\\dosubring{#1}}\n"); -static string const subdot_def = +static docstring const subdot_def = from_ascii( "\\newcommand{\\dosubdot}[2]{\\underaccent{#1.}{#2}}\n" - "\\newcommand{\\subdot}[1]{\\mathpalette\\dosubdot{#1}}\n"; + "\\newcommand{\\subdot}[1]{\\mathpalette\\dosubdot{#1}}\n"); -static string const subhat_def = +static docstring const subhat_def = from_ascii( "\\newcommand{\\dosubhat}[2]{\\underaccent{#1\\mathchar'136}{#2}}\n" - "\\newcommand{\\subhat}[1]{\\mathpalette\\dosubhat{#1}}\n"; + "\\newcommand{\\subhat}[1]{\\mathpalette\\dosubhat{#1}}\n"); -static string const subtilde_def = +static docstring const subtilde_def = from_ascii( "\\newcommand{\\dosubtilde}[2]{\\underaccent{#1\\mathchar'176}{#2}}\n" - "\\newcommand{\\subtilde}[1]{\\mathpalette\\dosubtilde{#1}}\n"; + "\\newcommand{\\subtilde}[1]{\\mathpalette\\dosubtilde{#1}}\n"); -static string const dacute_def = - "\\DeclareMathAccent{\\dacute}{\\mathalpha}{operators}{'175}\n"; +static docstring const dacute_def = from_ascii( + "\\DeclareMathAccent{\\dacute}{\\mathalpha}{operators}{'175}\n"); -static string const tipasymb_def = +static docstring const tipasymb_def = from_ascii( "\\DeclareFontEncoding{T3}{}{}\n" - "\\DeclareSymbolFont{tipasymb}{T3}{cmr}{m}{n}\n"; + "\\DeclareSymbolFont{tipasymb}{T3}{cmr}{m}{n}\n"); -static string const dgrave_def = - "\\DeclareMathAccent{\\dgrave}{\\mathord}{tipasymb}{'15}\n"; +static docstring const dgrave_def = from_ascii( + "\\DeclareMathAccent{\\dgrave}{\\mathord}{tipasymb}{'15}\n"); -static string const rcap_def = - "\\DeclareMathAccent{\\rcap}{\\mathord}{tipasymb}{'20}\n"; +static docstring const rcap_def = from_ascii( + "\\DeclareMathAccent{\\rcap}{\\mathord}{tipasymb}{'20}\n"); -static string const ogonek_def = +static docstring const ogonek_def = from_ascii( "\\newcommand{\\doogonek}[2]{\\setbox0=\\hbox{$#1#2$}\\underaccent{#1\\mkern-6mu\n" " \\ifx#2O\\hskip0.5\\wd0\\else\\ifx#2U\\hskip0.5\\wd0\\else\\hskip\\wd0\\fi\\fi\n" " \\ifx#2o\\mkern-2mu\\else\\ifx#2e\\mkern-1mu\\fi\\fi\n" " \\mathchar\"0\\hexnumber@\\symtipasymb0C}{#2}}\n" - "\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n"; + "\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n"); ///////////////////////////////////////////////////////////////////// // @@ -363,12 +368,10 @@ void LaTeXFeatures::useInsetLayout(InsetLayout const & lay) { docstring const & lname = lay.name(); DocumentClass const & tclass = params_.documentClass(); - if (!tclass.hasInsetLayout(lname)) { - lyxerr << "LaTeXFeatures::useInsetLayout: layout `" - << to_utf8(lname) << "' does not exist in this class" - << endl; + + // this is a default inset layout, nothing useful here + if (!tclass.hasInsetLayout(lname)) return; - } // Is this layout already in usedInsetLayouts? if (find(usedInsetLayouts_.begin(), usedInsetLayouts_.end(), lname) != usedInsetLayouts_.end()) @@ -397,7 +400,7 @@ bool LaTeXFeatures::isAvailable(string const & name) if (i != string::npos) { string const from = name.substr(0,i); string const to = name.substr(i+2); - LYXERR0("from=[" << from << "] to=[" << to << "]"); + //LYXERR0("from=[" << from << "] to=[" << to << "]"); return theConverters().isReachable(from, to); } @@ -638,7 +641,7 @@ string const LaTeXFeatures::getPackages() const // the document does not contain integrals (then isRequired("esint") // is false) or if esint is used, since esint redefines all relevant // integral symbols from wasysym and amsmath. - // See http://bugzilla.lyx.org/show_bug.cgi?id=1942 + // See http://www.lyx.org/trac/ticket/1942 if (mustProvide("wasysym") && (params_.use_esint != BufferParams::package_off || !isRequired("esint"))) packages << "\\usepackage{wasysym}\n"; @@ -647,6 +650,14 @@ string const LaTeXFeatures::getPackages() const if (mustProvide("accents")) packages << "\\usepackage{accents}\n"; + // mathdots must be loaded after amsmath + if (mustProvide("mathdots")) + packages << "\\usepackage{mathdots}\n"; + + // yhmath must be loaded after amsmath + if (mustProvide("yhmath")) + packages << "\\usepackage{yhmath}\n"; + // [x]color and pdfcolmk are handled in getColorOptions() above // makeidx.sty @@ -734,6 +745,11 @@ string const LaTeXFeatures::getPackages() const packages << "\\PassOptionsToPackage{normalem}{ulem}\n" "\\usepackage{ulem}\n"; + if (mustProvide("mhchem") && + params_.use_mhchem != BufferParams::package_off) + packages << "\\PassOptionsToPackage{version=3}{mhchem}\n" + "\\usepackage{mhchem}\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 @@ -749,18 +765,27 @@ string const LaTeXFeatures::getPackages() const } -string const LaTeXFeatures::getMacros() const +string LaTeXFeatures::getPreambleSnippets() const { - ostringstream macros; - - if (!preamble_snippets_.empty()) - macros << '\n'; + ostringstream snip; SnippetList::const_iterator pit = preamble_snippets_.begin(); SnippetList::const_iterator pend = preamble_snippets_.end(); for (; pit != pend; ++pit) - macros << *pit << '\n'; + snip << *pit << '\n'; + return snip.str(); +} + - if (mustProvide("papersize")) { +docstring const LaTeXFeatures::getMacros() const +{ + odocstringstream macros; + + if (!preamble_snippets_.empty()) { + macros << '\n'; + macros << from_utf8(getPreambleSnippets()); + } + + if (mustProvide("papersize")) { if (runparams_.flavor == OutputParams::LATEX) macros << papersizedvi_def << '\n'; else @@ -779,8 +804,19 @@ string const LaTeXFeatures::getMacros() const if (mustProvide("lyxarrow")) macros << lyxarrow_def << '\n'; - if (mustProvide("textgreek")) - macros << textgreek_def << '\n'; + if (mustProvide("textgreek")) { + // Avoid a LaTeX error if times fonts are used and the grtimes + // package is installed but actual fonts are not (bug 6469). + if (params_.fontsRoman == "times") + macros << subst(textgreek_def, + from_ascii("\\greektext #1"), + from_ascii("%\n \\IfFileExists" + "{grtm10.tfm}{}{\\fontfamily" + "{cmr}}\\greektext #1")) + << '\n'; + else + macros << textgreek_def << '\n'; + } if (mustProvide("textcyr")) macros << textcyr_def << '\n'; @@ -931,6 +967,66 @@ docstring const LaTeXFeatures::getTClassPreamble() const } +docstring const LaTeXFeatures::getTClassHTMLPreamble() const +{ + DocumentClass const & tclass = params_.documentClass(); + odocstringstream tcpreamble; + + tcpreamble << tclass.htmlpreamble(); + + list::const_iterator cit = usedLayouts_.begin(); + list::const_iterator end = usedLayouts_.end(); + for (; cit != end; ++cit) + tcpreamble << tclass[*cit].htmlpreamble(); + + cit = usedInsetLayouts_.begin(); + end = usedInsetLayouts_.end(); + TextClass::InsetLayouts const & ils = tclass.insetLayouts(); + for (; cit != end; ++cit) { + TextClass::InsetLayouts::const_iterator it = ils.find(*cit); + if (it == ils.end()) + continue; + tcpreamble << it->second.htmlpreamble(); + } + + return tcpreamble.str(); +} + + +docstring const LaTeXFeatures::getTClassHTMLStyles() const { + DocumentClass const & tclass = params_.documentClass(); + odocstringstream tcpreamble; + + list::const_iterator cit = usedLayouts_.begin(); + list::const_iterator end = usedLayouts_.end(); + for (; cit != end; ++cit) + tcpreamble << tclass[*cit].htmlstyle(); + + cit = usedInsetLayouts_.begin(); + end = usedInsetLayouts_.end(); + TextClass::InsetLayouts const & ils = tclass.insetLayouts(); + for (; cit != end; ++cit) { + TextClass::InsetLayouts::const_iterator it = ils.find(*cit); + if (it == ils.end()) + continue; + tcpreamble << it->second.htmlstyle(); + } + + return tcpreamble.str(); +} + + +namespace { +docstring const getFloatI18nPreamble(docstring const & type, docstring const & name, docstring const & lang) +{ + odocstringstream os; + os << "\\addto\\captions" << lang + << "{\\renewcommand{\\" << type << "name}{" << name << "}}\n"; + return os.str(); +} +} + + docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const { DocumentClass const & tclass = params_.documentClass(); @@ -952,6 +1048,28 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const snippets.insert(tclass[*cit].babelpreamble(*lit)); } } + if (use_babel && !UsedLanguages_.empty()) { + FloatList const & floats = params_.documentClass().floats(); + UsedFloats::const_iterator fit = usedFloats_.begin(); + UsedFloats::const_iterator fend = usedFloats_.end(); + for (; fit != fend; ++fit) { + Floating const & fl = floats.getType(fit->first); + docstring const type = from_ascii(fl.type()); + docstring const flname = from_utf8(fl.name()); + docstring name = translateIfPossible(flname, + buffer().language()->code()); + snippets.insert(getFloatI18nPreamble( + type, name, + from_ascii(buffer().language()->babel()))); + for (lang_it lit = lbeg; lit != lend; ++lit) { + name = translateIfPossible(flname, + (*lit)->code()); + snippets.insert(getFloatI18nPreamble( + type, name, + from_ascii((*lit)->babel()))); + } + } + } odocstringstream tcpreamble; set::const_iterator const send = snippets.end(); @@ -997,7 +1115,7 @@ void LaTeXFeatures::showStruct() const { lyxerr << "LyX needs the following commands when LaTeXing:" << "\n***** Packages:" << getPackages() - << "\n***** Macros:" << getMacros() + << "\n***** Macros:" << to_utf8(getMacros()) << "\n***** Textclass stuff:" << to_utf8(getTClassPreamble()) << "\n***** done." << endl; } @@ -1021,7 +1139,7 @@ BufferParams const & LaTeXFeatures::bufferParams() const } -void LaTeXFeatures::getFloatDefinitions(ostream & os) const +void LaTeXFeatures::getFloatDefinitions(odocstream & os) const { FloatList const & floats = params_.documentClass().floats(); @@ -1029,12 +1147,12 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const // We will try to do this as minimal as possible. // \floatstyle{ruled} // \newfloat{algorithm}{htbp}{loa} - // \floatname{algorithm}{Algorithm} + // \providecommand{\algorithmname}{Algorithm} + // \floatname{algorithm}{\protect\algorithmname} UsedFloats::const_iterator cit = usedFloats_.begin(); UsedFloats::const_iterator end = usedFloats_.end(); - // ostringstream floats; for (; cit != end; ++cit) { - Floating const & fl = floats.getType((cit->first)); + Floating const & fl = floats.getType(cit->first); // For builtin floats we do nothing. if (fl.builtin()) continue; @@ -1045,9 +1163,9 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const // but only if builtin == false // and that have to be true at this point in the // function. - string const type = fl.type(); - string const placement = fl.placement(); - string const style = fl.style(); + docstring const type = from_ascii(fl.type()); + docstring const placement = from_ascii(fl.placement()); + docstring const style = from_ascii(fl.style()); if (!style.empty()) { os << "\\floatstyle{" << style << "}\n" << "\\restylefloat{" << type << "}\n"; @@ -1059,20 +1177,24 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const } else { // The other non builtin floats. - string const type = fl.type(); - string const placement = fl.placement(); - string const ext = fl.ext(); - string const within = fl.within(); - string const style = fl.style(); - string const name = fl.name(); + docstring const type = from_ascii(fl.type()); + docstring const placement = from_ascii(fl.placement()); + docstring const ext = from_ascii(fl.ext()); + docstring const within = from_ascii(fl.within()); + docstring const style = from_ascii(fl.style()); + docstring const name = translateIfPossible( + from_utf8(fl.name()), + buffer().language()->code()); os << "\\floatstyle{" << style << "}\n" << "\\newfloat{" << type << "}{" << placement << "}{" << ext << '}'; if (!within.empty()) os << '[' << within << ']'; os << '\n' - << "\\floatname{" << type << "}{" - << name << "}\n"; + << "\\providecommand{\\" << type << "name}{" + << name << "}\n" + << "\\floatname{" << type << "}{\\protect\\" + << type << "name}\n"; // What missing here is to code to minimalize the code // output so that the same floatstyle will not be @@ -1080,7 +1202,7 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const // effect. (Lgb) } if (cit->second) - os << "\n\\newsubfloat{" << fl.type() << "}\n"; + os << "\n\\newsubfloat{" << from_ascii(fl.type()) << "}\n"; } }