anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use integer arithmetic for drawing logos; fix LaTeX output

Browse Source 
Using fraction of points is a reasonable way to avoid warnings with fussy compilers.

Moreover, this fixes the output of PHRASE_LATEX2E to use the proper form \LaTeXe.

The file format still uses the questionnable form \\LaTeX2e.
This commit is contained in:
Jean-Marc Lasgouttes 2015-03-18 11:32:49 +01:00
parent 6787ec05f7
commit 6010f38e01
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/insets/InsetSpecialChar.cpp
View File

@ -47,32 +47,32 @@ namespace {
int logoWidth(FontInfo const & font, InsetSpecialChar::Kind kind) { int logoWidth(FontInfo const & font, InsetSpecialChar::Kind kind) {
frontend::FontMetrics const & fm = theFontMetrics(font); frontend::FontMetrics const & fm = theFontMetrics(font);
double const em = fm.width('M'); int const em = fm.width('M');
int width = 0; int width = 0;
// See drawlogo() below to understand what this does. // See drawlogo() below to understand what this does.
switch (kind) { switch (kind) {
case InsetSpecialChar::PHRASE_LYX: case InsetSpecialChar::PHRASE_LYX:
width = fm.width(from_ascii("L")) - 0.16667 * em width = fm.width(from_ascii("L")) - em / 6
+ fm.width(from_ascii("Y")) - 0.125 * em + fm.width(from_ascii("Y")) - em / 8
+ fm.width(from_ascii("X")); + fm.width(from_ascii("X"));
break; break;
case InsetSpecialChar::PHRASE_TEX: case InsetSpecialChar::PHRASE_TEX:
width = fm.width(from_ascii("T")) - 0.16667 * em width = fm.width(from_ascii("T")) - em / 6
+ fm.width(from_ascii("E")) - 0.125 * em + fm.width(from_ascii("E")) - em / 8
+ fm.width(from_ascii("X")); + fm.width(from_ascii("X"));
break; break;
case InsetSpecialChar::PHRASE_LATEX2E: case InsetSpecialChar::PHRASE_LATEX2E:
width = logoWidth(font, InsetSpecialChar::PHRASE_LATEX) width = logoWidth(font, InsetSpecialChar::PHRASE_LATEX)
+ 0.15 * em + 3 * em / 20
+ fm.width(from_ascii("2") + char_type(0x03b5)); + fm.width(from_ascii("2") + char_type(0x03b5));
break; break;
case InsetSpecialChar::PHRASE_LATEX: { case InsetSpecialChar::PHRASE_LATEX: {
FontInfo smaller = font; FontInfo smaller = font;
smaller.decSize().decSize(); smaller.decSize().decSize();
width = fm.width(from_ascii("L")) - 0.36 * em width = fm.width(from_ascii("L")) - 9 * em / 25
+ theFontMetrics(smaller).width(from_ascii("A")) - 0.15 * em + theFontMetrics(smaller).width(from_ascii("A")) - 3 * em / 20
+ logoWidth(font, InsetSpecialChar::PHRASE_TEX); + logoWidth(font, InsetSpecialChar::PHRASE_TEX);
break; break;
} }
@ -139,16 +139,16 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
FontInfo const & font = pi.base.font; FontInfo const & font = pi.base.font;
// FIXME: this definition of em is bogus, but there is a need // FIXME: this definition of em is bogus, but there is a need
// for a big refactoring of the code around this issue anyway. // for a big refactoring of the code around this issue anyway.
double const em = theFontMetrics(font).width('M'); int const em = theFontMetrics(font).width('M');
switch (kind) { switch (kind) {
case InsetSpecialChar::PHRASE_LYX: case InsetSpecialChar::PHRASE_LYX:
/** Reference macro: /** Reference macro:
* \providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\\@}; * \providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\\@};
*/ */
x += pi.pain.text(x, y, from_ascii("L"), font); x += pi.pain.text(x, y, from_ascii("L"), font);
x -= 0.16667 * em; x -= em / 6;
x += pi.pain.text(x, y + 0.25 * em, from_ascii("Y"), font); x += pi.pain.text(x, y + em / 4, from_ascii("Y"), font);
x -= 0.125 * em; x -= em / 8;
x += pi.pain.text(x, y, from_ascii("X"), font); x += pi.pain.text(x, y, from_ascii("X"), font);
break; break;
@ -156,11 +156,11 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
/** Reference macro: /** Reference macro:
* \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@} * \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@}
*/ */
double const ex = theFontMetrics(font).ascent('x'); int const ex = theFontMetrics(font).ascent('x');
x += pi.pain.text(x, y, from_ascii("T"), font); x += pi.pain.text(x, y, from_ascii("T"), font);
x -= 0.16667 * em; x -= em / 6;
x += pi.pain.text(x, y + 0.5 * ex, from_ascii("E"), font); x += pi.pain.text(x, y + ex / 2, from_ascii("E"), font);
x -= 0.125 * em; x -= em / 8;
x += pi.pain.text(x, y, from_ascii("X"), font); x += pi.pain.text(x, y, from_ascii("X"), font);
break; break;
} }
@ -171,9 +171,9 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
* \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}} * \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}}
*/ */
drawLogo(pi, InsetSpecialChar::PHRASE_LATEX, x, y); drawLogo(pi, InsetSpecialChar::PHRASE_LATEX, x, y);
x += 0.15 * em; x += 3 * em / 20;
x += pi.pain.text(x, y, from_ascii("2"), font); x += pi.pain.text(x, y, from_ascii("2"), font);
x += pi.pain.text(x, y + 0.25 * em, char_type(0x03b5), font); x += pi.pain.text(x, y + em / 4, char_type(0x03b5), font);
break; break;
case InsetSpecialChar::PHRASE_LATEX: { case InsetSpecialChar::PHRASE_LATEX: {
@ -190,11 +190,11 @@ void drawLogo(PainterInfo & pi, InsetSpecialChar::Kind kind, int & x, int & y) {
* \TeX} * \TeX}
*/ */
x += pi.pain.text(x, y, from_ascii("L"), font); x += pi.pain.text(x, y, from_ascii("L"), font);
x -= 0.36 * em; x -= 9 * em / 25;
FontInfo smaller = font; FontInfo smaller = font;
smaller.decSize().decSize(); smaller.decSize().decSize();
x += pi.pain.text(x, y - 0.2 * em, from_ascii("A"), smaller); x += pi.pain.text(x, y - em / 5, from_ascii("A"), smaller);
x -= 0.15 * em; x -= 3 * em / 20;
drawLogo(pi, InsetSpecialChar::PHRASE_TEX, x, y); drawLogo(pi, InsetSpecialChar::PHRASE_TEX, x, y);
break; break;
} }
@ -396,7 +396,7 @@ void InsetSpecialChar::latex(otexstream & os,
case PHRASE_LATEX2E: case PHRASE_LATEX2E:
if (rp.moving_arg) if (rp.moving_arg)
os << "\\protect"; os << "\\protect";
os << "\\LaTeX2e{}"; os << "\\LaTeXe{}";
break; break;
case PHRASE_LATEX: case PHRASE_LATEX:
if (rp.moving_arg) if (rp.moving_arg)