The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 1a248c68b4dcfe43fcfc6aaab27ddcecab0428b6 Author: Juergen Spitzmueller <[email protected]> Date: Sat Sep 22 14:22:57 2012 +0200 check for libertine-type1 diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx index eac93e2..cc0b876 100644 --- a/lib/chkconfig.ltx +++ b/lib/chkconfig.ltx @@ -360,6 +360,7 @@ \TestPackage{feyn} \TestPackage{fourier} \TestPackage{libertine} +\TestPackage{libertine-type1} \TestPackage{lmodern} \TestPackage{luximono} \TestPackage{mathdesign}% For Roman fonts diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx index dd6ac8c..55cb304 100644 --- a/lib/doc/LaTeXConfig.lyx +++ b/lib/doc/LaTeXConfig.lyx @@ -596,7 +596,7 @@ Libertine Found: \begin_inset Info type "package" -arg "libertine" +arg "libertine-type1" \end_inset @@ -605,16 +605,26 @@ arg "libertine" \begin_layout Description CTAN: \family typewriter -fonts/libertine-legacy/ +fonts/libertine-type1/ \end_layout \begin_layout Description Notes: The \family sans -libertine(-legacy) +libertine-type1 +\family default + package provides support for the Libertine roman family of fonts. + And older version of the package, +\family sans +libertine-legacy \family default - package provides support for the Libertine roman and the Biolinum sans - serif families of fonts. + (found: +\begin_inset Info +type "package" +arg "libertine" +\end_inset + +), is also supported and used as a fallback. \end_layout \begin_layout Subsection commit 89df1de885a66c60bcbc64ff105d28e8bae0c261 Author: Juergen Spitzmueller <[email protected]> Date: Sat Sep 22 12:14:24 2012 +0200 No need to pass these diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 6379c39..d205a35 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -1415,11 +1415,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features, os << "\\usepackage{fontspec}\n"; // font selection must be done before loading fontenc.sty - string const fonts = - loadFonts(fonts_roman, fonts_sans, fonts_typewriter, - fonts_expert_sc, fonts_old_figures, - fonts_sans_scale, fonts_typewriter_scale, - useNonTeXFonts, features); + string const fonts = loadFonts(features); if (!fonts.empty()) os << from_utf8(fonts); @@ -2778,16 +2774,12 @@ string const BufferParams::parseFontName(string const & name) const } -string const BufferParams::loadFonts(string const & rm, - string const & sf, string const & tt, - bool const & sc, bool const & osf, - int const & sfscale, int const & ttscale, - bool const & use_systemfonts, - LaTeXFeatures & features) const +string const BufferParams::loadFonts(LaTeXFeatures & features) const { // TODO: separate math fonts. - if (rm == "default" && sf == "default" && tt == "default") + if (fonts_roman == "default" && fonts_sans == "default" + && fonts_typewriter == "default") //nothing to do return string(); @@ -2803,7 +2795,7 @@ string const BufferParams::loadFonts(string const & rm, * -- if there's a way to find out if a font really supports * OldStyle, enable/disable the widget accordingly. */ - if (use_systemfonts && features.isAvailable("fontspec")) { + if (useNonTeXFonts && features.isAvailable("fontspec")) { // "Mapping=tex-text" and "Ligatures=TeX" are equivalent. // However, until v.2 (2010/07/11) fontspec only knew // Mapping=tex-text (for XeTeX only); then "Ligatures=TeX" @@ -2816,28 +2808,28 @@ string const BufferParams::loadFonts(string const & rm, string const texmapping = (features.runparams().flavor == OutputParams::XETEX) ? "Mapping=tex-text" : "Ligatures=TeX"; - if (rm != "default") { + if (fonts_roman != "default") { os << "\\setmainfont[" << texmapping; - if (osf) + if (fonts_old_figures) os << ",Numbers=OldStyle"; - os << "]{" << parseFontName(rm) << "}\n"; + os << "]{" << parseFontName(fonts_roman) << "}\n"; } - if (sf != "default") { - string const sans = parseFontName(sf); - if (sfscale != 100) + if (fonts_sans != "default") { + string const sans = parseFontName(fonts_sans); + if (fonts_sans_scale != 100) os << "\\setsansfont[Scale=" - << float(sfscale) / 100 + << float(fonts_sans_scale) / 100 << "," << texmapping << "]{" << sans << "}\n"; else os << "\\setsansfont[" << texmapping << "]{" << sans << "}\n"; } - if (tt != "default") { - string const mono = parseFontName(tt); - if (ttscale != 100) + if (fonts_typewriter != "default") { + string const mono = parseFontName(fonts_typewriter); + if (fonts_typewriter_scale != 100) os << "\\setmonofont[Scale=" - << float(ttscale) / 100 + << float(fonts_typewriter_scale) / 100 << "]{" << mono << "}\n"; else @@ -2850,16 +2842,19 @@ string const BufferParams::loadFonts(string const & rm, // Tex Fonts bool const ot1 = (font_encoding() == "default" || font_encoding() == "OT1"); bool const dryrun = features.runparams().dryrun; - bool const complete = (sf == "default" && tt == "default"); + bool const complete = (fonts_sans == "default" && fonts_typewriter == "default"); // ROMAN FONTS - os << theLaTeXFonts().getLaTeXFont(from_ascii(rm)).getLaTeXCode(dryrun, ot1, complete, sc, osf); + os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_roman)).getLaTeXCode( + dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures); // SANS SERIF - os << theLaTeXFonts().getLaTeXFont(from_ascii(sf)).getLaTeXCode(dryrun, ot1, complete, sc, osf, sfscale); + os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_sans)).getLaTeXCode( + dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures, fonts_sans_scale); // MONOSPACED/TYPEWRITER - os << theLaTeXFonts().getLaTeXFont(from_ascii(tt)).getLaTeXCode(dryrun, ot1, complete, sc, osf, ttscale); + os << theLaTeXFonts().getLaTeXFont(from_ascii(fonts_typewriter)).getLaTeXCode( + dryrun, ot1, complete, fonts_expert_sc, fonts_old_figures, fonts_typewriter_scale); return os.str(); } diff --git a/src/BufferParams.h b/src/BufferParams.h index 560ccef..0d45a45 100644 --- a/src/BufferParams.h +++ b/src/BufferParams.h @@ -406,12 +406,7 @@ public: /// std::string const parseFontName(std::string const & name) const; /// set up the document fonts - std::string const loadFonts(std::string const & rm, - std::string const & sf, std::string const & tt, - bool const & sc, bool const & osf, - int const & sfscale, int const & ttscale, - bool const & use_nonlatexfonts, - LaTeXFeatures & features) const; + std::string const loadFonts(LaTeXFeatures & features) const; /// the cite engine modules LayoutModuleList const & citeEngine() const ----------------------------------------------------------------------- Summary of changes: lib/chkconfig.ltx | 1 + lib/doc/LaTeXConfig.lyx | 20 +++++++++++++---- src/BufferParams.cpp | 51 +++++++++++++++++++++------------------------- src/BufferParams.h | 7 +----- 4 files changed, 40 insertions(+), 39 deletions(-) hooks/post-receive -- The LyX Source Repository
