Does not compile on older gcc.

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

diff --git a/src/insets/InsetQuotes.cpp b/src/insets/InsetQuotes.cpp
index d7f7510ebd668bf43f471656a768d711d195b84b..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;
@@ -538,74 +538,8 @@ docstring InsetQuotesParams::getHTMLQuote(char_type c) const
 
 docstring InsetQuotesParams::getXMLQuote(char_type c) const
 {
-       string res;
-
-       switch (c){
-               case 0x201a: // ,
-                       res = "‚";
-                       break;
-               case 0x2019: // '
-                       res = "’";
-                       break;
-               case 0x2018: // `
-                       res = "‘";
-                       break;
-               case 0x2039: // <
-                       res = "&#8249;";
-                       break;
-               case 0x203a: // >
-                       res = "&#8250;";
-                       break;
-               case 0x0027: // ' (plain)
-                       res = "&#x27;";
-                       break;
-               case 0x201e: // ,,
-                       res = "&#8222;";
-                       break;
-               case 0x201d: // ''
-                       res = "&#8221;";
-                       break;
-               case 0x201c: // ``
-                       res = "&#8220;";
-                       break;
-               case 0x00ab: // <<
-                       res = "&#171;";
-                       break;
-               case 0x00bb: // >>
-                       res = "&#187;";
-                       break;
-               case 0x0022: // "
-                       res = "&#34;";
-                       break;
-               case 0x300c: // LEFT CORNER BRACKET
-                       res = "&#x300c;";
-                       break;
-               case 0x300d: // RIGHT CORNER BRACKET
-                       res = "&#x300d;";
-                       break;
-               case 0x300e: // LEFT WHITE CORNER BRACKET
-                       res = "&#x300e;";
-                       break;
-               case 0x300f: // RIGHT WHITE CORNER BRACKET
-                       res = "&#x300f;";
-                       break;
-               case 0x300a: // LEFT DOUBLE ANGLE BRACKET
-                       res = "&#x300a;";
-                       break;
-               case 0x300b: // RIGHT DOUBLE ANGLE BRACKET
-                       res = "&#x300b;";
-                       break;
-               case 0x3008: // LEFT ANGLE BRACKET
-                       res = "&#x3008;";
-                       break;
-               case 0x3009: // RIGHT ANGLE BRACKET
-                       res = "&#x3009;";
-                       break;
-               default:
-                       break;
-       }
-
-       return from_ascii(res);
+       // Directly output the character Unicode form.
+       return from_ascii("&#" + to_string(c) + ";");
 }
 
 
@@ -1024,6 +958,7 @@ docstring InsetQuotes::getQuoteEntity(bool isHTML) const {
                        (style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_;
        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
@@ -1032,19 +967,18 @@ docstring InsetQuotes::getQuoteEntity(bool isHTML) 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(false);
-       return 0;
+       xs << XMLStream::ESCAPE_NONE << getQuoteEntity(false);
 }