X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFonts.cpp;h=c9d030e8c343af500af6d0ac204da4c988bcbb43;hb=7067f48fa7afb89575abc58495d076078ce20137;hp=12c0856c5db4c7bd1e16ef4b388bb070715d239b;hpb=d6a7ec506eb4145f5a8108684222e77b695d21f9;p=lyx.git

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 12c0856c5d..c9d030e8c3 100644
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -35,13 +35,13 @@ namespace lyx {
 LaTeXFonts latexfonts;
 
 
-LaTeXFont LaTeXFont::altFont(docstring const & name)
+LaTeXFont LaTeXFont::altFont(docstring const & name) const
 {
 	return theLaTeXFonts().getAltFont(name);
 }
 
 
-bool LaTeXFont::available(bool ot1, bool nomath)
+bool LaTeXFont::available(bool ot1, bool nomath) const
 {
 	if (nomath && !nomathfont_.empty())
 		return altFont(nomathfont_).available(ot1, nomath);
@@ -57,8 +57,8 @@ bool LaTeXFont::available(bool ot1, bool nomath)
 		&& LaTeXFeatures::isAvailable(to_ascii(package_)))
 		return true;
 	else if (!altfonts_.empty()) {
-		for (size_t i = 0; i < altfonts_.size(); ++i) {
-			if (altFont(altfonts_[i]).available(ot1, nomath))
+		for (auto const & name : altfonts_) {
+			if (altFont(name).available(ot1, nomath))
 				return true;
 		}
 	}
@@ -66,9 +66,9 @@ bool LaTeXFont::available(bool ot1, bool nomath)
 }
 
 
-bool LaTeXFont::providesNoMath(bool ot1, bool complete)
+bool LaTeXFont::providesNoMath(bool ot1, bool complete) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, false);
+	docstring const usedfont = getUsedFont(ot1, complete, false, false);
 
 	if (usedfont.empty())
 		return false;
@@ -79,9 +79,9 @@ bool LaTeXFont::providesNoMath(bool ot1, bool complete)
 }
 
 
-bool LaTeXFont::providesOSF(bool ot1, bool complete, bool nomath)
+bool LaTeXFont::providesOSF(bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 
 	if (usedfont.empty())
 		return false;
@@ -96,9 +96,9 @@ bool LaTeXFont::providesOSF(bool ot1, bool complete, bool nomath)
 }
 
 
-bool LaTeXFont::providesSC(bool ot1, bool complete, bool nomath)
+bool LaTeXFont::providesSC(bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 
 	if (usedfont.empty())
 		return false;
@@ -111,9 +111,9 @@ bool LaTeXFont::providesSC(bool ot1, bool complete, bool nomath)
 }
 
 
-bool LaTeXFont::hasMonolithicExpertSet(bool ot1, bool complete, bool nomath)
+bool LaTeXFont::hasMonolithicExpertSet(bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 
 	if (usedfont.empty())
 		return false;
@@ -124,9 +124,9 @@ bool LaTeXFont::hasMonolithicExpertSet(bool ot1, bool complete, bool nomath)
 }
 
 
-bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath)
+bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 
 	if (usedfont.empty())
 		return false;
@@ -134,13 +134,13 @@ bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath)
 		return altFont(usedfont).providesScale(ot1, complete, nomath);
 	else if (!available(ot1, nomath))
 		return false;
-	return (!scaleoption_.empty());
+	return (!scaleoption_.empty() || !scalecmd_.empty());
 }
 
 
-bool LaTeXFont::providesMoreOptions(bool ot1, bool complete, bool nomath)
+bool LaTeXFont::providesMoreOptions(bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 
 	if (usedfont.empty())
 		return false;
@@ -152,9 +152,9 @@ bool LaTeXFont::providesMoreOptions(bool ot1, bool complete, bool nomath)
 	return (moreopts_);
 }
 
-bool LaTeXFont::provides(std::string const & name, bool ot1, bool complete, bool nomath)
+bool LaTeXFont::provides(std::string const & name, bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 
 	if (usedfont.empty())
 		return false;
@@ -163,17 +163,19 @@ bool LaTeXFont::provides(std::string const & name, bool ot1, bool complete, bool
 	else if (provides_.empty())
 		return false;
 
-	for (size_t i = 0; i < provides_.size(); ++i) {
-		if (provides_[i] == name)
+	for (auto const & provide : provides_) {
+		if (provide == name)
 			return true;
 	}
 	return false;
 }
 
 
-docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath)
+docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath, bool osf) const
 {
-	if (nomath && !nomathfont_.empty() && available(ot1, true))
+	if (osf && osfFontOnly())
+		return osffont_;
+	else if (nomath && !nomathfont_.empty() && available(ot1, true))
 		return nomathfont_;
 	else if (ot1 && !ot1font_.empty())
 		return (ot1font_ == "none") ? docstring() : ot1font_;
@@ -198,10 +200,10 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath)
 			return name_;
 	}
 	else if (!altfonts_.empty()) {
-		for (size_t i = 0; i < altfonts_.size(); ++i) {
-			LaTeXFont altf = altFont(altfonts_[i]);
+		for (auto const & name : altfonts_) {
+			LaTeXFont altf = altFont(name);
 			if (altf.available(ot1, nomath))
-				return altf.getUsedFont(ot1, complete, nomath);
+				return altf.getUsedFont(ot1, complete, nomath, osf);
 		}
 	}
 
@@ -209,16 +211,16 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath)
 }
 
 
-docstring const LaTeXFont::getUsedPackage(bool ot1, bool complete, bool nomath)
+docstring const LaTeXFont::getUsedPackage(bool ot1, bool complete, bool nomath) const
 {
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, false);
 	if (usedfont.empty())
 		return docstring();
 	return theLaTeXFonts().getLaTeXFont(usedfont).package();
 }
 
 
-string const LaTeXFont::getAvailablePackage(bool dryrun)
+string const LaTeXFont::getAvailablePackage(bool dryrun) const
 {
 	if (package_.empty())
 		return string();
@@ -243,7 +245,7 @@ string const LaTeXFont::getAvailablePackage(bool dryrun)
 
 
 string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool osf,
-					  int scale, string const & extraopts, bool nomath)
+					  int scale, string const & extraopts, bool nomath) const
 {
 	ostringstream os;
 	bool const needosfopt = (osf != osfdefault_);
@@ -290,12 +292,11 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool
 
 
 string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool sc,
-				     bool osf, bool nomath, string const & extraopts,
-				     int const & scale)
+				     bool osf, bool nomath, string const & extraopts, int scale) const
 {
 	ostringstream os;
 
-	docstring const usedfont = getUsedFont(ot1, complete, nomath);
+	docstring const usedfont = getUsedFont(ot1, complete, nomath, osf);
 	if (usedfont.empty())
 		return string();
 	else if (usedfont != name_)
@@ -327,6 +328,15 @@ string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool
 	if (osf && providesOSF(ot1, complete, nomath) && !osffont_.empty())
 		os << altFont(osffont_).getLaTeXCode(dryrun, ot1, complete, sc, osf,
 						     nomath, extraopts, scale);
+	if (scale != 100 && !scalecmd_.empty()
+	    && providesScale(ot1, complete, nomath)) {
+		if (contains(scalecmd_, '@'))
+			os << "\\makeatletter\n";
+		os << subst(to_ascii(scalecmd_), "$$val",
+			    convert<std::string>(float(scale) / 100)) << '\n';
+		if (contains(scalecmd_, '@'))
+			os << "\\makeatother\n";
+	}
 
 	if (!preamble_.empty())
 		os << to_utf8(preamble_);
@@ -357,6 +367,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 		LF_NOMATHFONT,
 		LF_OSFDEFAULT,
 		LF_OSFFONT,
+		LF_OSFFONTONLY,
 		LF_OSFOPTION,
 		LF_OSFSCOPTION,
 		LF_OT1_FONT,
@@ -366,6 +377,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 		LF_PREAMBLE,
 		LF_PROVIDES,
 		LF_REQUIRES,
+		LF_SCALECMD,
 		LF_SCALEOPTION,
 		LF_SCOPTION,
 		LF_SWITCHDEFAULT
@@ -383,6 +395,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 		{ "nomathfont",           LF_NOMATHFONT },
 		{ "osfdefault",           LF_OSFDEFAULT },
 		{ "osffont",              LF_OSFFONT },
+		{ "osffontonly",          LF_OSFFONTONLY },
 		{ "osfoption",            LF_OSFOPTION },
 		{ "osfscoption",          LF_OSFSCOPTION },
 		{ "ot1font",              LF_OT1_FONT },
@@ -391,6 +404,7 @@ bool LaTeXFont::readFont(Lexer & lex)
 		{ "preamble",             LF_PREAMBLE },
 		{ "provides",             LF_PROVIDES },
 		{ "requires",             LF_REQUIRES },
+		{ "scalecommand",         LF_SCALECMD },
 		{ "scaleoption",          LF_SCALEOPTION },
 		{ "scoption",             LF_SCOPTION },
 		{ "switchdefault",        LF_SWITCHDEFAULT }
@@ -452,6 +466,9 @@ bool LaTeXFont::readFont(Lexer & lex)
 		case LF_OSFDEFAULT:
 			lex >> osfdefault_;
 			break;
+		case LF_OSFFONTONLY:
+			lex >> osffontonly_;
+			break;
 		case LF_OSFSCOPTION:
 			lex >> osfscoption_;
 			break;
@@ -476,6 +493,9 @@ bool LaTeXFont::readFont(Lexer & lex)
 		case LF_REQUIRES:
 			lex >> required_;
 			break;
+		case LF_SCALECMD:
+			lex >> scalecmd_;
+			break;
 		case LF_SCALEOPTION:
 			lex >> scaleoption_;
 			break;
@@ -501,9 +521,10 @@ bool LaTeXFont::readFont(Lexer & lex)
 
 bool LaTeXFont::read(Lexer & lex)
 {
-	switchdefault_ = 0;
-	osfdefault_ = 0;
-	moreopts_ = 0;
+	switchdefault_ = false;
+	osfdefault_ = false;
+	moreopts_ = false;
+	osffontonly_ = false;
 
 	if (!lex.next()) {
 		lex.printError("No name given for LaTeX font: `$$Token'.");