#include "InsetSpecialChar.h"
#include "Dimension.h"
+#include "Encoding.h"
#include "Font.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "texstream.h"
#include "frontends/FontMetrics.h"
+#include "frontends/NullPainter.h"
#include "frontends/Painter.h"
#include "support/debug.h"
}
-namespace {
-
-int logoWidth(FontInfo const & font, InsetSpecialChar::Kind kind) {
- frontend::FontMetrics const & fm = theFontMetrics(font);
- int const em = fm.em();
- int width = 0;
- // See drawlogo() below to understand what this does.
- switch (kind) {
- case InsetSpecialChar::PHRASE_LYX:
- width = fm.width(from_ascii("L")) - em / 6
- + fm.width(from_ascii("Y")) - em / 8
- + fm.width(from_ascii("X"));
- break;
-
- case InsetSpecialChar::PHRASE_TEX:
- width = fm.width(from_ascii("T")) - em / 6
- + fm.width(from_ascii("E")) - em / 8
- + fm.width(from_ascii("X"));
- break;
-
- case InsetSpecialChar::PHRASE_LATEX2E:
- width = logoWidth(font, InsetSpecialChar::PHRASE_LATEX)
- + 3 * em / 20
- + fm.width(from_ascii("2") + char_type(0x03b5));
- break;
- case InsetSpecialChar::PHRASE_LATEX: {
- FontInfo smaller = font;
- smaller.decSize().decSize();
- width = fm.width(from_ascii("L")) - 9 * em / 25
- + theFontMetrics(smaller).width(from_ascii("A")) - 3 * em / 20
- + logoWidth(font, InsetSpecialChar::PHRASE_TEX);
- break;
- }
- default:
- LYXERR0("No information for computing width of logo " << kind);
- }
-
- return width;
-}
-
-} // namespace
-
docstring InsetSpecialChar::toolTip(BufferView const &, int, int) const
{
docstring message;
}
-void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
-{
- frontend::FontMetrics const & fm =
- theFontMetrics(mi.base.font);
- dim.asc = fm.maxAscent();
- dim.des = fm.maxDescent();
- dim.wid = 0;
-
- docstring s;
- switch (kind_) {
- case ALLOWBREAK:
- dim.wid = fm.em() / 8;
- break;
- case LIGATURE_BREAK:
- s = from_ascii("|");
- break;
- case END_OF_SENTENCE:
- s = from_ascii(".");
- break;
- case LDOTS:
- s = from_ascii(". . .");
- break;
- case MENU_SEPARATOR:
- s = from_ascii(" x ");
- break;
- case HYPHENATION:
- dim.wid = fm.width(from_ascii("-"));
- if (dim.wid > 5)
- dim.wid -= 2; // to make it look shorter
- break;
- case SLASH:
- s = from_ascii("/");
- break;
- case NOBREAKDASH:
- s = from_ascii("-");
- break;
- case PHRASE_LYX:
- case PHRASE_TEX:
- case PHRASE_LATEX2E:
- case PHRASE_LATEX:
- dim.wid = logoWidth(mi.base.font, kind_);
- break;
- }
- if (dim.wid == 0)
- dim.wid = fm.width(s);
-}
-
-
namespace {
// helper function: draw text and update x.
/** Reference macro:
* \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
*/
- int const ex = theFontMetrics(font).ascent('x');
+ int const ex = theFontMetrics(font).xHeight();
drawChar(pi, x, y, 'T');
x -= em / 6;
drawChar(pi, x, y + ex / 2, 'E');
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;
} // namespace
+
+void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+ frontend::FontMetrics const & fm =
+ theFontMetrics(mi.base.font);
+ dim.asc = fm.maxAscent();
+ dim.des = 0;
+ dim.wid = 0;
+
+ docstring s;
+ switch (kind_) {
+ case ALLOWBREAK:
+ dim.asc = fm.xHeight();
+ dim.des = fm.descent('g');
+ dim.wid = fm.em() / 8;
+ break;
+ case LIGATURE_BREAK:
+ s = from_ascii("|");
+ break;
+ case END_OF_SENTENCE:
+ s = from_ascii(".");
+ break;
+ case LDOTS:
+ s = from_ascii(". . .");
+ break;
+ case MENU_SEPARATOR:
+ // ▹ U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE
+ // There is a \thinspace on each side of the triangle
+ dim.wid = 2 * fm.em() / 6 + fm.width(char_type(0x25B9));
+ break;
+ case HYPHENATION:
+ dim.wid = fm.width(from_ascii("-"));
+ if (dim.wid > 5)
+ dim.wid -= 2; // to make it look shorter
+ break;
+ case SLASH:
+ s = from_ascii("/");
+ dim.des = fm.descent(s[0]);
+ break;
+ case NOBREAKDASH:
+ s = from_ascii("-");
+ break;
+ case PHRASE_LYX:
+ case PHRASE_TEX:
+ case PHRASE_LATEX2E:
+ case PHRASE_LATEX:
+ dim.asc = fm.maxAscent();
+ dim.des = fm.maxDescent();
+ frontend::NullPainter np;
+ PainterInfo pi(mi.base.bv, np);
+ pi.base.font = mi.base.font;
+ drawLogo(pi, dim.wid, 0, kind_);
+ break;
+ }
+ if (dim.wid == 0)
+ dim.wid = fm.width(s);
+}
+
+
void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
{
FontInfo font = pi.base.font;
case ALLOWBREAK:
{
// A small vertical line
- int const asc = theFontMetrics(pi.base.font).ascent('x');
+ int const asc = theFontMetrics(pi.base.font).xHeight();
int const desc = theFontMetrics(pi.base.font).descent('g');
int const x0 = x; // x + 1; // FIXME: incline,
int const x1 = x; // x - 1; // similar to LibreOffice?
frontend::FontMetrics const & fm =
theFontMetrics(font);
- // A triangle the width and height of an 'x'
- int w = fm.width(char_type('x'));
- int ox = fm.width(char_type(' ')) + x;
- int h = fm.ascent(char_type('x'));
- int xp[4], yp[4];
-
- xp[0] = ox; yp[0] = y;
- xp[1] = ox; yp[1] = y - h;
- xp[2] = ox + w; yp[2] = y - h/2;
- xp[3] = ox; yp[3] = y;
-
- pi.pain.lines(xp, yp, 4, Color_special);
+ // There is a \thinspace on each side of the triangle
+ x += fm.em() / 6;
+ // ▹ U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE
+ // ◃ U+25C3 WHITE LEFT-POINTING SMALL TRIANGLE
+ char_type const c = pi.ltr_pos ? 0x25B9 : 0x25C3;
+ font.setColor(Color_special);
+ pi.pain.text(x, y, c, font);
break;
}
case SLASH:
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) {
|| rp.local_font->language()->lang() == "farsi")
lswitch = "\\textLR{";
}
-
+
switch (kind_) {
case HYPHENATION:
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:
case HYPHENATION:
break;
case ALLOWBREAK:
+ // U+200B ZERO WIDTH SPACE (ZWSP)
os.put(0x200b);
break;
case LIGATURE_BREAK:
break;
case PHRASE_LATEX2E:
os << "LaTeX2";
+ // ε U+03B5 GREEK SMALL LETTER EPSILON
os.put(0x03b5);
break;
case PHRASE_LATEX:
projects / lyx.git / blobdiff