#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"
str = "eld";
}
- int i;
-
// '.' wildcard means: keep current style
if (!allow_wildcards || str[0] != '.') {
+ int i;
for (i = 0; i < stylescount(); ++i) {
if (str[0] == style_char[i]) {
res = QuoteStyle(i);
str = "eld";
}
- int i;
-
// '.' wildcard means: keep current side
if (!allow_wildcards || str[1] != '.') {
+ int i;
for (i = 0; i < 2; ++i) {
if (str[1] == side_char[i]) {
res = InsetQuotesParams::QuoteSide(i);
str = "eld";
}
- int i;
-
// '.' wildcard means: keep current level
if (!allow_wildcards || str[2] != '.') {
+ int i;
for (i = 0; i < 2; ++i) {
if (str[2] == level_char[i]) {
res = InsetQuotesParams::QuoteLevel(i);
char_type InsetQuotesParams::getQuoteChar(QuoteStyle const & style, QuoteLevel const & level,
- QuoteSide const & side) const
+ QuoteSide const & side, bool const rtl) const
{
// main opening quotation mark
char_type left_primary;
switch (level) {
case SecondaryQuotes:
+ if (rtl)
+ return (side == ClosingQuote) ? left_secondary : right_secondary;
return (side == OpeningQuote) ? left_secondary : right_secondary;
case PrimaryQuotes:
+ if (rtl)
+ return (side == ClosingQuote) ? left_primary : right_primary;
return (side == OpeningQuote) ? left_primary : right_primary;
default:
break;
}
-docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op) const
+docstring InsetQuotesParams::getLaTeXQuote(char_type c, string const & op,
+ bool const rtl) const
{
string res;
}
case 0x2019: {// '
if (op == "int")
- res = "\\textquoteleft";
+ // This macro is redefined in rtl mode
+ res = rtl ? "\\textquoteleft" : "\\textquoteright";
else
res = "'";
break;
}
case 0x2018: {// `
if (op == "int")
- res = "\\textquoteright";
+ // This macro is redefined in rtl mode
+ res = rtl ? "\\textquoteright" : "\\textquoteleft";
else
res = "`";
break;
}
case 0x201d: {// ''
if (op == "int")
- res = "\\textquotedblleft";
+ // This macro is redefined in rtl mode
+ res = rtl ? "\\textquotedblleft" : "\\textquotedblright";
else
res = "''";
break;
}
case 0x201c: {// ``
if (op == "int")
- res = "\\textquotedblright";
+ // This macro is redefined in rtl mode
+ 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 const InsetQuotesParams::getShortGuiLabel(docstring const string)
+docstring const InsetQuotesParams::getShortGuiLabel(docstring const & str)
{
- std::string const s = to_ascii(string);
+ string const s = to_ascii(str);
QuoteStyle const style = getQuoteStyle(s);
QuoteSide const side = getQuoteSide(s);
QuoteLevel const level = getQuoteLevel(s);
InsetQuotes::InsetQuotes(Buffer * buf, string const & str)
: Inset(buf),
style_(InsetQuotesParams::EnglishQuotes), side_(InsetQuotesParams::OpeningQuote),
- pass_thru_(false), internal_fontenc_(false)
+ pass_thru_(false), internal_fontenc_(false), rtl_(false)
{
if (buf) {
global_style_ = buf->masterBuffer()->params().quotes_style;
InsetQuotes::InsetQuotes(Buffer * buf, char_type c, InsetQuotesParams::QuoteLevel level,
string const & side, string const & style)
- : Inset(buf), level_(level), pass_thru_(false), fontspec_(false), internal_fontenc_(false)
+ : Inset(buf), level_(level), pass_thru_(false), fontspec_(false),
+ internal_fontenc_(false), rtl_(false)
{
bool dynamic = false;
if (buf) {
fontspec_ = buf->masterBuffer()->params().useNonTeXFonts;
} else {
global_style_ = InsetQuotesParams::EnglishQuotes;
- fontenc_ = lyxrc.fontenc;
+ fontenc_ = "OT1";
fontspec_ = false;
}
if (style.empty())
InsetQuotesParams::QuoteStyle style =
(style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_;
- docstring retdisp = docstring(1, quoteparams.getQuoteChar(style, level_, side_));
+ docstring retdisp = docstring(1, quoteparams.getQuoteChar(style, level_, side_, rtl_));
// in French, thin spaces are added inside double guillemets
if (prefixIs(context_lang_, "fr")
}
cur.recordUndoInset(this);
parseString(cmd.getArg(1), true);
- cur.buffer()->updateBuffer();
+ cur.forceBufferUpdate();
break;
}
default:
{
InsetQuotesParams::QuoteStyle style =
(style_ == InsetQuotesParams::DynamicQuotes) ? global_style_ : style_;
- char_type quotechar = quoteparams.getQuoteChar(style, level_, side_);
+ char_type quotechar = quoteparams.getQuoteChar(style, level_, side_, rtl_);
docstring qstr;
// In pass-thru context, we output plain quotes
// (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");
qstr = from_ascii("\\og");
else
qstr = from_ascii("\\fg");
+ } else if (runparams.use_hyperref && runparams.moving_arg) {
+ // Use internal commands in headings with hyperref
+ // (ligatures not featured in PDF strings)
+ qstr = quoteparams.getLaTeXQuote(quotechar, "int", rtl_);
} else if (fontenc_ == "T1"
&& !runparams.local_font->language()->internalFontEncoding()) {
// Quotation marks for T1 font encoding
} else if (runparams.local_font->language()->internalFontEncoding()) {
// Quotation marks for internal font encodings
// (ligatures not featured)
- qstr = quoteparams.getLaTeXQuote(quotechar, "int");
+ qstr = quoteparams.getLaTeXQuote(quotechar, "int", rtl_);
#ifdef DO_USE_DEFAULT_LANGUAGE
} else if ((doclang == "default"
#else
}
-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();
}
}
-void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/)
+void InsetQuotes::updateBuffer(ParIterator const & it, UpdateType /* utype*/, bool const /*deleted*/)
{
BufferParams const & bp = buffer().masterBuffer()->params();
+ Font const & font = it.paragraph().getFontSettings(bp, it.pos());
pass_thru_ = it.paragraph().isPassThru();
- context_lang_ = it.paragraph().getFontSettings(bp, it.pos()).language()->code();
- internal_fontenc_ = it.paragraph().getFontSettings(bp, it.pos()).language()->internalFontEncoding();
+ context_lang_ = font.language()->code();
+ internal_fontenc_ = font.language()->internalFontEncoding();
fontenc_ = bp.main_font_encoding();
global_style_ = bp.quotes_style;
fontspec_ = bp.useNonTeXFonts;
+ rtl_ = font.isRightToLeft();
}
switch (type) {
case 0x0027: {
if (features.runparams().isFullUnicode() && fontspec_)
- features.require("textquotesinglep");
- else
- features.require("textcomp");
- break;
+ features.require("textquotesinglep");
+ else
+ features.require("textcomp");
+ break;
}
case 0x0022: {
if (features.runparams().isFullUnicode() && fontspec_)
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;
projects / lyx.git / blobdiff