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

Update latex export of combining characters.

Browse Source 
* Remove exception for polytonikogreek (drop braces)
  no longer required since the fixes to #6463 and #9637.
* Update comments.
This commit is contained in:
Günter Milde 2019-03-02 18:58:53 +01:00
parent 99bacf006e
commit 7dfc6c7f8b
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Encoding.cpp
View File

@ -580,7 +580,7 @@ string const Encodings::TIPAShortcut(char_type c)
return string(); return string();
} }
// Return true, if `c` is a supported Greek or Cyrillic letter.
bool Encodings::isKnownScriptChar(char_type const c, string & preamble) bool Encodings::isKnownScriptChar(char_type const c, string & preamble)
{ {
CharInfoMap::const_iterator const it = unicodesymbols.find(c); CharInfoMap::const_iterator const it = unicodesymbols.find(c);
@ -602,6 +602,8 @@ bool Encodings::isKnownScriptChar(char_type const c, string & preamble)
bool Encodings::needsScriptWrapper(string const & script, string const & fontenc) bool Encodings::needsScriptWrapper(string const & script, string const & fontenc)
{ {
// Note: the wrapper is not required with Unicode font encoding "TU".
// However, this function is not called with non-TeX (Unicode) fonts.
if (script == "textgreek") if (script == "textgreek")
return (fontenc != "LGR"); return (fontenc != "LGR");
if (script == "textcyrillic") { if (script == "textcyrillic") {

33
src/Paragraph.cpp
View File

@ -869,7 +869,7 @@ int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
return end - i; return end - i;
} }
// Handle combining characters
int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams, int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
otexstream & os, char_type c, char_type next, otexstream & os, char_type c, char_type next,
OutputParams const & runparams) OutputParams const & runparams)
@ -895,16 +895,15 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
docstring::size_type const brace1 = latex2.find_first_of(from_ascii("{")); docstring::size_type const brace1 = latex2.find_first_of(from_ascii("{"));
docstring::size_type const brace2 = latex2.find_last_of(from_ascii("}")); docstring::size_type const brace2 = latex2.find_last_of(from_ascii("}"));
string script = to_ascii(latex2.substr(1, brace1 - 1)); string script = to_ascii(latex2.substr(1, brace1 - 1));
// "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
// whether they are encodable or not (it only depends on the font encoding), // Greek and Cyrillic letters need to be wrapped in \textcyrillic and \textgreek if they
// except if we are using fontspec. // are not encodable in the current font encoding (regardless of the input encoding).
bool scriptchar = false; bool scriptchar = false;
if (!bparams.useNonTeXFonts) if (!bparams.useNonTeXFonts) // With non-TeX fonts the font encoding is Unicode.
// This will get us a script value to deal with below
scriptchar = Encodings::isKnownScriptChar(c, script); scriptchar = Encodings::isKnownScriptChar(c, script);
if (!scriptchar && docstring(1, next) == latex1) { if (!scriptchar && docstring(1, next) == latex1) {
// The encoding supports the combination: // Font and input encoding support the combination:
// output as is (combining char after base char). // output as is (combining char after base char).
os << latex2 << latex1; os << latex2 << latex1;
return latex1.length() + latex2.length(); return latex1.length() + latex2.length();
@ -920,14 +919,11 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
docstring scriptmacro; docstring scriptmacro;
docstring cb; docstring cb;
if (script == "textgreek" || script == "textcyrillic") { if (script == "textgreek" || script == "textcyrillic") {
// We separate the script macro (\text[greek|cyr]) from the rest, // Strip the \text(greek|cyrillic) script macro ...
// since we need to include the combining char in it (#6463).
// This is "the rest":
pos = brace1 + 1; pos = brace1 + 1;
length -= pos; length -= pos;
latex2 = latex2.substr(pos, length); latex2 = latex2.substr(pos, length);
// We only need the script macro with non-native font encodings // and place it before the accent macro if required (#6463)
// and with XeTeX/LuaTeX (with TeX fonts)
if (Encodings::needsScriptWrapper(script, fontenc) if (Encodings::needsScriptWrapper(script, fontenc)
|| runparams.isFullUnicode()) { || runparams.isFullUnicode()) {
scriptmacro = from_ascii("\\" + script + "{"); scriptmacro = from_ascii("\\" + script + "{");
@ -935,17 +931,8 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
} }
} }
docstring lb; os << scriptmacro << latex1 << "{" << latex2 << "}" << cb;
docstring rb; return latex1.length() + 1 + latex2.length() + 1 + cb.length();
// polutonikogreek does not play nice with brackets
if (!runparams.local_font
|| runparams.local_font->language()->lang() != "polutonikogreek") {
lb = from_ascii("{");
rb = from_ascii("}");
}
os << scriptmacro << latex1 << lb << latex2 << rb << cb;
return latex1.length() + latex2.length() + lb.length() + rb.length() + cb.length();
} }