anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Constify LaTeXFont

Browse Source
This commit is contained in:
Yuriy Skalko 2020-11-01 14:00:49 +02:00
parent 81a5e7927b
commit 1fdcd7bf14
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/LaTeXFonts.cpp
View File

@ -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);
@ -66,7 +66,7 @@ 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, false);
@ -79,7 +79,7 @@ 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, false);
@ -96,7 +96,7 @@ 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, false);
@ -111,7 +111,7 @@ 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, false);
@ -124,7 +124,7 @@ 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, false);
@ -138,7 +138,7 @@ bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath)
}
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, false);
@ -152,7 +152,7 @@ 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, false);
@ -171,7 +171,7 @@ bool LaTeXFont::provides(std::string const & name, bool ot1, bool complete, bool
}
docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath, bool osf)
docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath, bool osf) const
{
if (osf && osfFontOnly())
return osffont_;
@ -211,7 +211,7 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath, boo
}
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, false);
if (usedfont.empty())
@ -220,7 +220,7 @@ docstring const LaTeXFont::getUsedPackage(bool ot1, bool complete, bool nomath)
}
string const LaTeXFont::getAvailablePackage(bool dryrun)
string const LaTeXFont::getAvailablePackage(bool dryrun) const
{
if (package_.empty())
return string();
@ -245,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_);
@ -292,7 +292,7 @@ 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 scale)
bool osf, bool nomath, string const & extraopts, int scale) const
{
ostringstream os;

56
src/LaTeXFonts.h
View File

@ -30,42 +30,42 @@ public:
LaTeXFont() : osfdefault_(false), switchdefault_(false), moreopts_(false),
osffontonly_(false) { fontenc_.push_back("T1"); }
/// The font name
docstring const & name() { return name_; }
docstring const & name() const { return name_; }
/// The name to appear in the document dialog
docstring const & guiname() { return guiname_; }
docstring const & guiname() const { return guiname_; }
/// Font family (rm, sf, tt)
docstring const & family() { return family_; }
docstring const & family() const { return family_; }
/// The package that provides this font
docstring const & package() { return package_; }
docstring const & package() const { return package_; }
/// Does this provide a specific font encoding?
bool hasFontenc(std::string const &) const;
/// The font encoding(s)
std::vector<std::string> const & fontencs() const { return fontenc_; }
/// Alternative font if package() is not available
std::vector<docstring> const & altfonts() { return altfonts_; }
std::vector<docstring> const & altfonts() const { return altfonts_; }
/// A font that provides all families
docstring const & completefont() { return completefont_; }
docstring const & completefont() const { return completefont_; }
/// A font specifically needed for OT1 font encoding
docstring const & ot1font() { return ot1font_; }
docstring const & ot1font() const { return ot1font_; }
/// A font that provides Old Style Figures for this type face
docstring const & osffont() { return osffont_; }
docstring const & osffont() const { return osffont_; }
/// A package option for Old Style Figures
docstring const & osfoption() { return osfoption_; }
docstring const & osfoption() const { return osfoption_; }
/// A package option for true SmallCaps
docstring const & scoption() { return scoption_; }
docstring const & scoption() const { return scoption_; }
/// A package option for both Old Style Figures and SmallCaps
docstring const & osfscoption() { return osfscoption_; }
docstring const & osfscoption() const { return osfscoption_; }
/// A package option for font scaling
docstring const & scaleoption() { return scaleoption_; }
docstring const & scaleoption() const { return scaleoption_; }
/// A macro for font scaling
docstring const & scalecmd() { return scalecmd_; }
docstring const & scalecmd() const { return scalecmd_; }
/// Does this provide additional options?
bool providesMoreOptions(bool ot1, bool complete, bool nomath);
bool providesMoreOptions(bool ot1, bool complete, bool nomath) const;
/// Alternative requirement to test for
docstring const & required() { return required_; }
docstring const & required() const { return required_; }
/// Does this font provide a given \p feature
bool provides(std::string const & name, bool ot1,
bool complete, bool nomath);
bool complete, bool nomath) const;
/// Issue the familydefault switch
bool switchdefault() const { return switchdefault_; }
/// Does the font provide Old Style Figures as default?
@ -73,35 +73,35 @@ public:
/// Does OSF font replace (rather than complement) the non-OSF one?
bool osfFontOnly() const { return osffontonly_; }
/// Is this font available?
bool available(bool ot1, bool nomath);
bool available(bool ot1, bool nomath) const;
/// Does this font provide an alternative without math?
bool providesNoMath(bool ot1, bool complete);
bool providesNoMath(bool ot1, bool complete) const;
/// Does this font provide Old Style Figures?
bool providesOSF(bool ot1, bool complete, bool nomath);
bool providesOSF(bool ot1, bool complete, bool nomath) const;
/// Does this font provide optional true SmallCaps?
bool providesSC(bool ot1, bool complete, bool nomath);
bool providesSC(bool ot1, bool complete, bool nomath) const;
/** does this font provide OSF and Small Caps only via
* a single, undifferentiated expert option?
*/
bool hasMonolithicExpertSet(bool ot1, bool complete, bool nomath);
bool hasMonolithicExpertSet(bool ot1, bool complete, bool nomath) const;
/// Does this font provide scaling?
bool providesScale(bool ot1, bool complete, bool nomath);
bool providesScale(bool ot1, bool complete, bool nomath) const;
/// Return the LaTeX Code
std::string const getLaTeXCode(bool dryrun, bool ot1, bool complete,
bool sc, bool osf, bool nomath,
std::string const & extraopts = std::string(),
int scale = 100);
int scale = 100) const;
/// Return the actually used font
docstring const getUsedFont(bool ot1, bool complete, bool nomath, bool osf);
docstring const getUsedFont(bool ot1, bool complete, bool nomath, bool osf) const;
/// Return the actually used package
docstring const getUsedPackage(bool ot1, bool complete, bool nomath);
docstring const getUsedPackage(bool ot1, bool complete, bool nomath) const;
///
bool read(Lexer & lex);
///
bool readFont(Lexer & lex);
private:
/// Return the preferred available package
std::string const getAvailablePackage(bool dryrun);
std::string const getAvailablePackage(bool dryrun) const;
/// Return the package options
std::string const getPackageOptions(bool ot1,
bool complete,
@ -109,9 +109,9 @@ private:
bool osf,
int scale,
std::string const & extraopts,
bool nomath);
bool nomath) const;
/// Return an alternative font
LaTeXFont altFont(docstring const & name);
LaTeXFont altFont(docstring const & name) const;
///
docstring name_;
///