anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Amend 91ff5c4198

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-07-17 21:16:05 +02:00
parent 4f83429fcc
commit efefde4c00
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/LaTeXFonts.cpp
View File

@ -251,8 +251,8 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool
bool const has_sc = providesSC(ot1, complete, nomath);
bool const moreopts = providesMoreOptions(ot1, complete, nomath);
if (!packageoption_.empty())
os << to_ascii(packageoption_);
if (!packageoptions_.empty())
os << to_ascii(packageoptions_);
if (sc && needosfopt && has_osf && has_sc) {
if (!os.str().empty())
@ -462,7 +462,7 @@ bool LaTeXFont::readFont(Lexer & lex)
lex >> package_;
break;
case LF_PACKAGEOPTIONS:
lex >> packageoption_;
lex >> packageoptions_;
break;
case LF_PREAMBLE:
preamble_ = lex.getLongString(from_ascii("EndPreamble"));

4
src/LaTeXFonts.h
View File

@ -49,7 +49,7 @@ public:
/// A font that provides Old Style Figures for this type face
docstring const & osffont() { return osffont_; }
/// A package option needed to load this font
docstring const & packageoption() { return packageoption_; }
docstring const & packageoptions() { return packageoptions_; }
/// A package option for Old Style Figures
docstring const & osfoption() { return osfoption_; }
/// A package option for true SmallCaps
@ -130,7 +130,7 @@ private:
///
docstring osffont_;
///
docstring packageoption_;
docstring packageoptions_;
///
docstring osfoption_;
///