The branch, master, has been updated. - Log -----------------------------------------------------------------
commit f94220a79cc2aea755be8c03e2e309f837c141ac Author: Juergen Spitzmueller <[email protected]> Date: Mon Dec 31 10:51:37 2012 +0100 Fix LaTeX fonts availability detection (bug #8476) diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp index ce772bc..c837815 100644 --- a/src/LaTeXFonts.cpp +++ b/src/LaTeXFonts.cpp @@ -88,7 +88,7 @@ bool LaTeXFont::providesOSF(bool ot1, bool complete, bool nomath) return altFont(usedfont).providesOSF(ot1, complete, nomath); else if (!osffont_.empty()) return altFont(osffont_).available(ot1, nomath); - else if (!package_.empty() && !LaTeXFeatures::isAvailable(to_ascii(package_))) + else if (!available(ot1, nomath)) return false; return (!osfoption_.empty() || !osfscoption_.empty()); @@ -103,7 +103,7 @@ bool LaTeXFont::providesSC(bool ot1, bool complete, bool nomath) return false; else if (usedfont != name_) return altFont(usedfont).providesSC(ot1, complete, nomath); - else if (!package_.empty() && !LaTeXFeatures::isAvailable(to_ascii(package_))) + else if (!available(ot1, nomath)) return false; return (!scoption_.empty() || !osfscoption_.empty()); @@ -118,9 +118,8 @@ bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath) return false; else if (usedfont != name_) return altFont(usedfont).providesScale(ot1, complete, nomath); - else if (!package_.empty() && !LaTeXFeatures::isAvailable(to_ascii(package_))) + else if (!available(ot1, nomath)) return false; - return (!scaleoption_.empty()); } ----------------------------------------------------------------------- Summary of changes: src/LaTeXFonts.cpp | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- The LyX Source Repository
