}
-Inset::RowFlags InsetSpecialChar::rowFlags() const
+int InsetSpecialChar::rowFlags() const
{
switch (kind_) {
case ALLOWBREAK:
void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
{
- frontend::FontMetrics const & fm =
- theFontMetrics(mi.base.font);
+ frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
dim.asc = fm.maxAscent();
dim.des = 0;
dim.wid = 0;
case END_OF_SENTENCE:
s = from_ascii(".");
break;
- case LDOTS:
- s = from_ascii(". . .");
+ case LDOTS: {
+ // see comment in draw().
+ auto const fam = mi.base.font.family();
+ // Multiplication by 3 is done here to limit rounding effects.
+ int const spc3 = fam == TYPEWRITER_FAMILY ? 0 : 3 * fm.width(char_type(' ')) / 2;
+ dim.wid = 3 * fm.width(char_type('.')) + spc3;
break;
+ }
case MENU_SEPARATOR:
// ▹ U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE
// There is a \thinspace on each side of the triangle
case LDOTS:
{
font.setColor(Color_special);
- string ell = ". . . ";
- docstring dell(ell.begin(), ell.end());
- pi.pain.text(x, y, dell, font);
+ /* \textellipsis uses a \fontdimen3 is spacing. The TeXbook
+ * tells us that \fontdimen3 is the interword stretch, and
+ * that this is usually half a space.
+ */
+ frontend::FontMetrics const & fm = theFontMetrics(font);
+ auto const fam = pi.base.font.family();
+ int const spc = fam == TYPEWRITER_FAMILY ? 0 : fm.width(char_type(' ')) / 2;
+ int wid1 = fm.width(char_type('.')) + spc;
+ pi.pain.text(x, y, char_type('.'), font);
+ pi.pain.text(x + wid1, y, char_type('.'), font);
+ pi.pain.text(x + 2 * wid1, y, char_type('.'), font);
break;
}
case MENU_SEPARATOR:
{
- frontend::FontMetrics const & fm =
- theFontMetrics(font);
+ frontend::FontMetrics const & fm = theFontMetrics(font);
// There is a \thinspace on each side of the triangle
x += fm.em() / 6;
}
-void InsetSpecialChar::docbook(XMLStream & xs, OutputParams const &) const
-{
- switch (kind_) {
- case HYPHENATION:
- // Soft hyphen.
- xs << XMLStream::ESCAPE_NONE << "­";
- break;
- case ALLOWBREAK:
- // Zero-width space
- xs << XMLStream::ESCAPE_NONE << "​";
- break;
- case LIGATURE_BREAK:
+namespace {
+string specialCharKindToXMLEntity(InsetSpecialChar::Kind kind) {
+ switch (kind) {
+ case InsetSpecialChar::Kind::HYPHENATION:
+ // Soft hyphen.
+ return "­";
+ case InsetSpecialChar::Kind::ALLOWBREAK:
+ // Zero-width space
+ return "​";
+ case InsetSpecialChar::Kind::LIGATURE_BREAK:
// Zero width non-joiner
- xs << XMLStream::ESCAPE_NONE << "‌";
- break;
- case END_OF_SENTENCE:
- xs << '.';
- break;
- case LDOTS:
+ return "‌";
+ case InsetSpecialChar::Kind::END_OF_SENTENCE:
+ return ".";
+ case InsetSpecialChar::Kind::LDOTS:
// …
- xs << XMLStream::ESCAPE_NONE << "…";
- break;
- case MENU_SEPARATOR:
+ return "…";
+ case InsetSpecialChar::Kind::MENU_SEPARATOR:
// ⇒, right arrow.
- xs << XMLStream::ESCAPE_NONE << "⇒";
- break;
- case SLASH:
+ return "⇒";
+ case InsetSpecialChar::Kind::SLASH:
// ⁄, fractional slash.
- xs << XMLStream::ESCAPE_NONE << "⁄";
- break;
+ return "⁄";
+ case InsetSpecialChar::Kind::NOBREAKDASH:
// Non-breaking hyphen.
- case NOBREAKDASH:
- xs << XMLStream::ESCAPE_NONE << "‑";
- break;
- case PHRASE_LYX:
- xs << "LyX";
- break;
- case PHRASE_TEX:
- xs << "TeX";
- break;
- case PHRASE_LATEX2E:
+ return "‑";
+ case InsetSpecialChar::Kind::PHRASE_LYX:
+ return "LyX";
+ case InsetSpecialChar::Kind::PHRASE_TEX:
+ return "TeX";
+ case InsetSpecialChar::Kind::PHRASE_LATEX2E:
// Lower-case epsilon.
- xs << "LaTeX2" << XMLStream::ESCAPE_NONE << "ε";
- break;
- case PHRASE_LATEX:
- xs << "LaTeX";
- break;
+ return "LaTeX2ε";
+ case InsetSpecialChar::Kind::PHRASE_LATEX:
+ return "LaTeX";
+ default:
+ return "";
}
}
+}
+
+
+void InsetSpecialChar::docbook(XMLStream & xs, OutputParams const &) const
+{
+ xs << XMLStream::ESCAPE_NONE << from_ascii(specialCharKindToXMLEntity(kind_));
+}
docstring InsetSpecialChar::xhtml(XMLStream & xs, OutputParams const &) const
{
- switch (kind_) {
- case HYPHENATION:
- break;
- case ALLOWBREAK:
- xs << XMLStream::ESCAPE_NONE << "​";
- break;
- case LIGATURE_BREAK:
- xs << XMLStream::ESCAPE_NONE << "‌";
- break;
- case END_OF_SENTENCE:
- xs << '.';
- break;
- case LDOTS:
- xs << XMLStream::ESCAPE_NONE << "…";
- break;
- case MENU_SEPARATOR:
- xs << XMLStream::ESCAPE_NONE << "⇒";
- break;
- case SLASH:
- xs << XMLStream::ESCAPE_NONE << "⁄";
- break;
- case NOBREAKDASH:
- xs << XMLStream::ESCAPE_NONE << "‑";
- break;
- case PHRASE_LYX:
- xs << "LyX";
- break;
- case PHRASE_TEX:
- xs << "TeX";
- break;
- case PHRASE_LATEX2E:
- xs << "LaTeX2" << XMLStream::ESCAPE_NONE << "ε";
- break;
- case PHRASE_LATEX:
- xs << "LaTeX";
- break;
- }
+ xs << XMLStream::ESCAPE_NONE << from_ascii(specialCharKindToXMLEntity(kind_));
return docstring();
}
break;
}
odocstringstream ods;
- plaintext(ods, OutputParams(0));
+ plaintext(ods, OutputParams(nullptr));
os << ods.str();
}
bool const) const
{
odocstringstream ods;
- plaintext(ods, OutputParams(0));
+ plaintext(ods, OutputParams(nullptr));
os += ods.str();
}