commit a6d3c1e6900d47e1a98d5996cce4484422ce3a51
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Mon Apr 30 15:22:50 2018 +0200

    Fake CJK quotes also for utf8 inputenc
    
    The glyphs are not covered yet.
    
    (cherry picked from commit 9644916d32d6fd8b2774f99596011254f6086c97)
---
 src/insets/InsetQuotes.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index cdf25cfe50..f67eb32cda 100644
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -863,8 +863,11 @@ void InsetQuotes::latex(otexstream & os, OutputParams 
const & runparams) const
                // (spacing and kerning is then handled respectively)
                qstr = docstring(1, quotechar);
        }
+       // The CJK marks are not yet covered by utf8 inputenc (we don't have 
the entry in
+       // unicodesymbols, since we don't want to add fake synbols there).
        else if (style == InsetQuotesParams::CJKQuotes || style  == 
InsetQuotesParams::CJKAngleQuotes) {
-               if (runparams.encoding && 
runparams.encoding->encodable(quotechar))
+               if (runparams.encoding && runparams.encoding->name() != "utf8"
+                   && runparams.encoding->encodable(quotechar))
                        qstr = docstring(1, quotechar);
                else
                        qstr = quoteparams.getLaTeXQuote(quotechar, "int");
@@ -1064,10 +1067,12 @@ void InsetQuotes::validate(LaTeXFeatures & features) 
const
                        features.require("textquotedbl");
                break;
        }
-       // we fake these from math
+       // we fake these from math (also for utf8 inputenc
+       // currently; see above)
        case 0x300e: // LEFT WHITE CORNER BRACKET
        case 0x300f: // RIGHT WHITE CORNER BRACKET
                if (!features.runparams().encoding
+                   || features.runparams().encoding->name() == "utf8"
                    || !features.runparams().encoding->encodable(type))
                        features.require("stmaryrd");
                break;
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to