#include "InsetSpecialChar.h"
#include "Dimension.h"
+#include "Encoding.h"
#include "Font.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
#include "MetricsInfo.h"
#include "output_xhtml.h"
+#include "xml.h"
#include "texstream.h"
#include "frontends/FontMetrics.h"
InsetSpecialChar::InsetSpecialChar(Kind k)
- : Inset(0), kind_(k)
+ : Inset(nullptr), kind_(k)
{}
}
+int InsetSpecialChar::rowFlags() const
+{
+ switch (kind_) {
+ case ALLOWBREAK:
+ case HYPHENATION:
+ case SLASH:
+ // these are the elements that allow line breaking
+ return CanBreakAfter;
+ case NOBREAKDASH:
+ case END_OF_SENTENCE:
+ case LIGATURE_BREAK:
+ case LDOTS:
+ case MENU_SEPARATOR:
+ case PHRASE_LYX:
+ case PHRASE_TEX:
+ case PHRASE_LATEX2E:
+ case PHRASE_LATEX:
+ break;
+ }
+ return Inline;
+}
+
+
namespace {
// helper function: draw text and update x.
drawLogo(pi, x, y, InsetSpecialChar::PHRASE_LATEX);
x += 3 * em / 20;
drawChar(pi, x, y, '2');
+ // ε U+03B5 GREEK SMALL LETTER EPSILON
drawChar(pi, x, y + em / 4, char_type(0x03b5));
break;
OutputParams const & rp) const
{
bool const rtl = rp.local_font->isRightToLeft();
+ bool const utf8 = rp.encoding->iconvName() == "UTF-8";
string lswitch = "";
string lswitche = "";
if (rtl && !rp.use_polyglossia) {
os << "\\-";
break;
case ALLOWBREAK:
+ // U+200B not yet supported by utf8 inputenc
os << "\\LyXZeroWidthSpace" << termcmd;
break;
case LIGATURE_BREAK:
- os << "\\textcompwordmark" << termcmd;
+ if (utf8)
+ // U+200C ZERO WIDTH NON-JOINER
+ os.put(0x200c);
+ else
+ os << "\\textcompwordmark" << termcmd;
break;
case END_OF_SENTENCE:
os << "\\@.";
case HYPHENATION:
return 0;
case ALLOWBREAK:
+ // U+200B ZERO WIDTH SPACE (ZWSP)
os.put(0x200b);
return 1;
case LIGATURE_BREAK:
+ // U+200C ZERO WIDTH NON-JOINER
os.put(0x200c);
return 1;
case END_OF_SENTENCE:
os << '.';
return 1;
case LDOTS:
+ // … U+2026 HORIZONTAL ELLIPSIS
os.put(0x2026);
return 1;
case MENU_SEPARATOR:
os << '/';
return 1;
case NOBREAKDASH:
+ // ‑ U+2011 NON-BREAKING HYPHEN
os.put(0x2011);
return 1;
case PHRASE_LYX:
return 3;
case PHRASE_LATEX2E:
os << "LaTeX2";
+ // ε U+03B5 GREEK SMALL LETTER EPSILON
os.put(0x03b5);
return 7;
case PHRASE_LATEX:
}
-int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const
+void InsetSpecialChar::docbook(XMLStream & xs, OutputParams const &) const
{
switch (kind_) {
- case HYPHENATION:
- break;
- case ALLOWBREAK:
- os.put(0x200b);
- break;
+ case HYPHENATION:
+ // Soft hyphen.
+ xs << XMLStream::ESCAPE_NONE << "­";
+ break;
+ case ALLOWBREAK:
+ // Zero-width space
+ xs << XMLStream::ESCAPE_NONE << "​";
+ break;
case LIGATURE_BREAK:
+ // Zero width non-joiner
+ xs << XMLStream::ESCAPE_NONE << "‌";
break;
case END_OF_SENTENCE:
- os << '.';
+ xs << '.';
break;
case LDOTS:
- os << "…";
+ // …
+ xs << XMLStream::ESCAPE_NONE << "…";
break;
case MENU_SEPARATOR:
- os << "&lyxarrow;";
+ // ⇒, right arrow.
+ xs << XMLStream::ESCAPE_NONE << "⇒";
break;
case SLASH:
- os << '/';
+ // ⁄, fractional slash.
+ xs << XMLStream::ESCAPE_NONE << "⁄";
break;
+ // Non-breaking hyphen.
case NOBREAKDASH:
- os << '-';
+ xs << XMLStream::ESCAPE_NONE << "‑";
break;
case PHRASE_LYX:
- os << "LyX";
+ xs << "LyX";
break;
case PHRASE_TEX:
- os << "TeX";
+ xs << "TeX";
break;
case PHRASE_LATEX2E:
- os << "LaTeX2";
- os.put(0x03b5);
+ // Lower-case epsilon.
+ xs << "LaTeX2" << XMLStream::ESCAPE_NONE << "ε";
break;
case PHRASE_LATEX:
- os << "LaTeX";
+ xs << "LaTeX";
break;
}
- return 0;
}
-docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetSpecialChar::xhtml(XMLStream & xs, OutputParams const &) const
{
switch (kind_) {
case HYPHENATION:
break;
case ALLOWBREAK:
- xs << XHTMLStream::ESCAPE_NONE << "​";
+ xs << XMLStream::ESCAPE_NONE << "​";
break;
case LIGATURE_BREAK:
- xs << XHTMLStream::ESCAPE_NONE << "‌";
+ xs << XMLStream::ESCAPE_NONE << "‌";
break;
case END_OF_SENTENCE:
xs << '.';
break;
case LDOTS:
- xs << XHTMLStream::ESCAPE_NONE << "…";
+ xs << XMLStream::ESCAPE_NONE << "…";
break;
case MENU_SEPARATOR:
- xs << XHTMLStream::ESCAPE_NONE << "⇒";
+ xs << XMLStream::ESCAPE_NONE << "⇒";
break;
case SLASH:
- xs << XHTMLStream::ESCAPE_NONE << "⁄";
+ xs << XMLStream::ESCAPE_NONE << "⁄";
break;
case NOBREAKDASH:
- xs << XHTMLStream::ESCAPE_NONE << "‑";
+ xs << XMLStream::ESCAPE_NONE << "‑";
break;
case PHRASE_LYX:
xs << "LyX";
xs << "TeX";
break;
case PHRASE_LATEX2E:
- xs << "LaTeX2" << XHTMLStream::ESCAPE_NONE << "ε";
+ xs << "LaTeX2" << XMLStream::ESCAPE_NONE << "ε";
break;
case PHRASE_LATEX:
xs << "LaTeX";
bool InsetSpecialChar::isLetter() const
{
return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK
- || kind_ == NOBREAKDASH;
+ || kind_ == NOBREAKDASH
+ || kind_ == PHRASE_LYX || kind_ == PHRASE_LATEX
+ || kind_ == PHRASE_TEX || kind_ == PHRASE_LATEX2E;
}