X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpecialChar.cpp;h=5983c07d649906ad69c225ae005c2b8c2fa801a5;hb=8124e6c02ea1fd6779bb6c47ffe2bca2c8bd2d97;hp=fd36a2134a24b92cff55a4bd13e6ed6396baefe5;hpb=a2378c11822e1478a20d36d2ad72558fcecdb923;p=lyx.git diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp index fd36a2134a..5983c07d64 100644 --- a/src/insets/InsetSpecialChar.cpp +++ b/src/insets/InsetSpecialChar.cpp @@ -209,11 +209,14 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const case END_OF_SENTENCE: s = from_ascii("."); break; - case LDOTS: + case LDOTS: { // see comment in draw(). - dim.wid = 3 * fm.width(char_type('.')) - + 3 * fm.width(char_type(' ')) / 2; + 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 @@ -291,7 +294,9 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const * that this is usually half a space. */ frontend::FontMetrics const & fm = theFontMetrics(font); - int wid1 = fm.width(char_type('.')) + fm.width(char_type(' ')) / 2; + 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);