#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"
case 0x2019: {// '
if (op == "int")
// This macro is redefined in rtl mode
- res = rtl ? "\\textquoteright" : "\\textquoteleft";
+ res = rtl ? "\\textquoteleft" : "\\textquoteright";
else
res = "'";
break;
case 0x2018: {// `
if (op == "int")
// This macro is redefined in rtl mode
- res = rtl ? "\\textquoteleft" : "\\textquoteright";
+ res = rtl ? "\\textquoteright" : "\\textquoteleft";
else
res = "`";
break;
case 0x201d: {// ''
if (op == "int")
// This macro is redefined in rtl mode
- res = rtl ? "\\textquotedblright" : "\\textquotedblleft";
+ res = rtl ? "\\textquotedblleft" : "\\textquotedblright";
else
res = "''";
break;
case 0x201c: {// ``
if (op == "int")
// This macro is redefined in rtl mode
- res = rtl ? "\\textquotedblleft" : "\\textquotedblright";
+ res = rtl ? "\\textquotedblright" : "\\textquotedblleft";
else
res = "``";
break;
}
// 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;
}
+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;
}
-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
|| style == InsetQuotesParams::SwissQuotes)) {
// THIN SPACE (U+2009)
docstring const thin_space = from_ascii(" ");
- 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();
}