Improved character count statistics for letter based insets (e.g. the LyX logo).

[features.git] / src / insets / InsetQuotes.cpp

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index 2f70f87222709651f7ddaac33509d3e1fbe3565b..b90f1c27dda850ae94e035260994dc5ec9ba11f2 100644 (file)
--- a/src/insets/InsetQuotes.cpp
+++ b/src/insets/InsetQuotes.cpp
@@ -28,10 +28,10 @@
 #include "LyXRC.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
-#include "output_xhtml.h"
 #include "Paragraph.h"
 #include "ParIterator.h"
 #include "texstream.h"
+#include "xml.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -350,7 +350,7 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op,
        case 0x2019: {// '
                if (op == "int")
                        // This macro is redefined in rtl mode
-                       res = rtl ? "\\textquoteright" : "\\textquoteleft";
+                       res = rtl ? "\\textquoteleft" : "\\textquoteright";
                else
                        res = "'";
                break;
@@ -358,7 +358,7 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op,
        case 0x2018: {// `
                if (op == "int")
                        // This macro is redefined in rtl mode
-                       res = rtl ? "\\textquoteleft" : "\\textquoteright";
+                       res = rtl ? "\\textquoteright" : "\\textquoteleft";
                else
                        res = "`";
                break;
@@ -393,7 +393,7 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op,
        case 0x201d: {// ''
                if (op == "int")
                        // This macro is redefined in rtl mode
-                       res = rtl ? "\\textquotedblright" : "\\textquotedblleft";
+                       res = rtl ? "\\textquotedblleft" : "\\textquotedblright";
                else
                        res = "''";
                break;
@@ -401,7 +401,7 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op,
        case 0x201c: {// ``
                if (op == "int")
                        // This macro is redefined in rtl mode
-                       res = rtl ? "\\textquotedblleft" : "\\textquotedblright";
+                       res = rtl ? "\\textquotedblright" : "\\textquotedblleft";
                else
                        res = "``";
                break;
@@ -430,7 +430,7 @@ docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op,
        }
        // The following are fakes
        // This is just to get something symbolic
-       // in encodings where this chars would not be used ayway
+       // in encodings where this chars would not be used anyway
        case 0x300c: // LEFT CORNER BRACKET
                res = "\\ensuremath{\\lceil}";
                break;
@@ -536,6 +536,13 @@ docstring InsetQuotesParams::getHTMLQuote(char_type c) const
 }
 
 
+docstring InsetQuotesParams::getXMLQuote(char_type c) const
+{
+       // Directly output the character Unicode form.
+       return from_ascii("&#" + to_string(c) + ";");
+}
+
+
 map<string, docstring> InsetQuotesParams::getTypes() const
 {
        map<string, docstring> res;
@@ -946,10 +953,12 @@ int InsetQuotes::plaintext(odocstringstream & os,
 }
 
 
-docstring InsetQuotes::getQuoteEntity() const {
+docstring InsetQuotes::getQuoteEntity(bool isHTML) const {
        InsetQuotesParams::QuoteStyle style =
                        (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_;
-       docstring res = quoteparams.getHTMLQuote(quoteparams.getQuoteChar(style, level_, side_));
+       docstring res = isHTML ? quoteparams.getHTMLQuote(quoteparams.getQuoteChar(style, level_, side_)) :
+                                       quoteparams.getXMLQuote(quoteparams.getQuoteChar(style, level_, side_));
+
        // in French, thin spaces are added inside double guillemets
        if (prefixIs(context_lang_, "fr")
            && level_ == InsetQuotesParams::PrimaryQuotes
@@ -958,25 +967,24 @@ docstring InsetQuotes::getQuoteEntity() const {
                || style == InsetQuotesParams::SwissQuotes)) {
                // THIN SPACE (U+2009)
                docstring const thin_space = from_ascii("&#x2009;");
-               if (side_ == InsetQuotesParams::OpeningQuote)
+               if (side_ == InsetQuotesParams::OpeningQuote) // Open quote: space after
                        res += thin_space;
-               else
+               else // Close quote: space before
                        res = thin_space + res;
        }
        return res;
 }
 
 
-int InsetQuotes::docbook(odocstream & os, OutputParams const &) const
+void InsetQuotes::docbook(XMLStream & xs, OutputParams const &) const
 {
-       os << getQuoteEntity();
-       return 0;
+       xs << XMLStream::ESCAPE_NONE << getQuoteEntity(false);
 }
 
 
-docstring InsetQuotes::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetQuotes::xhtml(XMLStream & xs, OutputParams const &) const
 {
-       xs << XHTMLStream::ESCAPE_NONE << getQuoteEntity();
+       xs << XMLStream::ESCAPE_NONE << getQuoteEntity(true);
        return docstring();
 }