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

Add "TODO-comments" with link to textcyr/textgreek tickets.

Browse Source 
Add links to tickets #9637 and  #9681 at places that require 
changes in the code and/or comments.
This commit is contained in:
Günter Milde 2015-07-15 18:55:30 +02:00
parent 7ac700920f
commit 605b933ec2
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Paragraph.cpp
View File

@ -915,10 +915,13 @@ int Paragraph::Private::writeScriptChars(otexstream & os,
{ {
// FIXME: modifying i here is not very nice... // FIXME: modifying i here is not very nice...
// We only arrive here when a proper language for character text_[i] has // We only arrive here when character text_[i] could not be translated
// not been specified (i.e., it could not be translated in the current // into the current latex encoding (or its latex translation has been forced,)
// latex encoding) or its latex translation has been forced, and it // and it belongs to a known script.
// belongs to a known script. // TODO: We need \textcyr and \textgreek wrappers also for characters
// that can be encoded in the "LaTeX encoding" but not in the
// current *font encoding*.
// (See #9681 for details and test)
// Parameter ltx contains the latex translation of text_[i] as specified // Parameter ltx contains the latex translation of text_[i] as specified
// in the unicodesymbols file and is something like "\textXXX{<spec>}". // in the unicodesymbols file and is something like "\textXXX{<spec>}".
// The latex macro name "textXXX" specifies the script to which text_[i] // The latex macro name "textXXX" specifies the script to which text_[i]
@ -934,6 +937,10 @@ int Paragraph::Private::writeScriptChars(otexstream & os,
bool closing_brace = true; bool closing_brace = true;
if (script == "textgreek" && encoding.latexName() == "iso-8859-7") { if (script == "textgreek" && encoding.latexName() == "iso-8859-7") {
// Correct encoding is being used, so we can avoid \textgreek. // Correct encoding is being used, so we can avoid \textgreek.
// TODO: wrong test: we need to check the *font encoding*
// (i.e. the active language and its FontEncoding tag)
// instead of the LaTeX *input encoding*!
// See #9637 for details and test-cases.
pos = brace1 + 1; pos = brace1 + 1;
length -= pos; length -= pos;
closing_brace = false; closing_brace = false;
@ -1156,9 +1163,9 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
return; return;
// If T1 font encoding is used, use the special // If T1 font encoding is used, use the special
// characters it provides. // characters it provides.
// NOTE: Some languages reset the font encoding internally. // NOTE: Some languages reset the font encoding internally to a
// If we are using such a language, we do not output // non-standard font encoding. If we are using such a language,
// special T1 chars. // we do not output special T1 chars.
if (!runparams.inIPA && !running_font.language()->internalFontEncoding() if (!runparams.inIPA && !running_font.language()->internalFontEncoding()
&& bparams.font_encoding() == "T1" && latexSpecialT1(c, os, i, column)) && bparams.font_encoding() == "T1" && latexSpecialT1(c, os, i, column))
return; return;