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

Define \textgreek only if needed

Browse Source 
Babel provides a definition if a Greek language is loaded.

Also, clarify some FIXMEs
This commit is contained in:
Juergen Spitzmueller 2018-04-21 15:00:42 +02:00
parent 4010ccafbd
commit ab4bd6b77e
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/LaTeXFeatures.cpp
View File

@ -609,6 +609,28 @@ bool LaTeXFeatures::isRequired(string const & name) const
bool LaTeXFeatures::isProvided(string const & name) const bool LaTeXFeatures::isProvided(string const & name) const
{ {
// \textgreek is provided by babel globally if a Greek language/variety
// is used in the document
if (useBabel() && name == "textgreek"
&& params_.main_font_encoding() != "default") {
// get main font encodings
vector<string> fontencs = params_.font_encodings();
// get font encodings of secondary languages
getFontEncodings(fontencs, true);
for (auto & fe : fontencs) {
if (!Encodings::needsScriptWrapper(name, fe))
return true;
}
}
// FIXME: Analoguously, babel provides a command \textcyrillic, but
// for some reason, we roll our own \textcyr definition
// We should use \textcyrillic instead and only define it
// if we do not use a respective language that features it (i.e.,
// add "textcyrillic" to the test above.
// FIXME: the "textbaltic" definitions are only needed if the context
// font-encoding where the respective char is is not l7x.
// We cannot check this here as we have no context information.
if (params_.useNonTeXFonts) if (params_.useNonTeXFonts)
return params_.documentClass().provides(name); return params_.documentClass().provides(name);
@ -634,9 +656,6 @@ bool LaTeXFeatures::isProvided(string const & name) const
from_ascii(params_.fontsMath())).provides(name, ot1, from_ascii(params_.fontsMath())).provides(name, ot1,
complete, complete,
nomath); nomath);
// TODO: "textbaltic" provided, if the font-encoding is "L7x"
// "textgreek" provided, if a language with font-encoding LGR is used in the document
// "textcyr" provided, if a language with font-encoding T2A is used in the document
} }
@ -880,16 +899,18 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
} }
void LaTeXFeatures::getFontEncodings(vector<string> & encs) const void LaTeXFeatures::getFontEncodings(vector<string> & encs, bool const onlylangs) const
{ {
// these must be loaded if glyphs of this script are used if (!onlylangs) {
// unless a language providing them is used in the document // these must be loaded if glyphs of this script are used
if (mustProvide("textgreek") // unless a language providing them is used in the document
&& find(encs.begin(), encs.end(), "LGR") == encs.end()) if (mustProvide("textgreek")
encs.insert(encs.begin(), "LGR"); && find(encs.begin(), encs.end(), "LGR") == encs.end())
if (mustProvide("textcyr") encs.insert(encs.begin(), "LGR");
&& find(encs.begin(), encs.end(), "T2A") == encs.end()) if (mustProvide("textcyr")
encs.insert(encs.begin(), "T2A"); && find(encs.begin(), encs.end(), "T2A") == encs.end())
encs.insert(encs.begin(), "T2A");
}
for (auto const & lang : UsedLanguages_) for (auto const & lang : UsedLanguages_)
if (!lang->fontenc().empty() if (!lang->fontenc().empty()

3
src/LaTeXFeatures.h
View File

@ -136,7 +136,8 @@ public:
/// ///
std::set<std::string> getEncodingSet(std::string const & doc_encoding) const; std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
/// ///
void getFontEncodings(std::vector<std::string> & encodings) const; void getFontEncodings(std::vector<std::string> & encodings,
bool const onlylangs = false) const;
/// ///
void useLayout(docstring const & lyt); void useLayout(docstring const & lyt);
/// ///