X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpecialChar.cpp;h=462620532b463b800befefa39e466719f07c5466;hb=e8c932ff842ced0b26c205ed6983102b6e7e50c2;hp=99707cbb59ddb8250606a161798cf60de41b2638;hpb=db8c16d554ebb1dcb319e44d318572de6eff024b;p=lyx.git diff --git a/src/insets/InsetSpecialChar.cpp b/src/insets/InsetSpecialChar.cpp index 99707cbb59..462620532b 100644 --- a/src/insets/InsetSpecialChar.cpp +++ b/src/insets/InsetSpecialChar.cpp @@ -5,7 +5,7 @@ * * \author Asger Alstrup Nielsen * \author Jean-Marc Lasgouttes - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * * Full author contact details are available in file CREDITS. */ @@ -15,9 +15,12 @@ #include "InsetSpecialChar.h" #include "Dimension.h" +#include "Font.h" #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" +#include "output_xhtml.h" +#include "texstream.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" @@ -31,7 +34,7 @@ namespace lyx { InsetSpecialChar::InsetSpecialChar(Kind k) - : kind_(k) + : Inset(0), kind_(k) {} @@ -41,46 +44,175 @@ InsetSpecialChar::Kind InsetSpecialChar::kind() const } +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; +} + +} + + 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; - string s; + docstring s; switch (kind_) { case LIGATURE_BREAK: - s = "|"; + s = from_ascii("|"); break; case END_OF_SENTENCE: - s = "."; + s = from_ascii("."); break; case LDOTS: - s = ". . ."; + s = from_ascii(". . ."); break; case MENU_SEPARATOR: - s = " x "; + s = from_ascii(" x "); break; case HYPHENATION: - s = "-"; + dim.wid = fm.width(from_ascii("-")); + if (dim.wid > 5) + dim.wid -= 2; // to make it look shorter break; case SLASH: - s = "/"; + s = from_ascii("/"); break; case NOBREAKDASH: - s = "-"; + s = from_ascii("-"); + break; + case PHRASE_LYX: + case PHRASE_TEX: + case PHRASE_LATEX2E: + case PHRASE_LATEX: + dim.wid = logoWidth(mi.base.font, kind_); break; } - docstring ds(s.begin(), s.end()); - dim.wid = fm.width(ds); - if (kind_ == HYPHENATION && dim.wid > 5) - dim.wid -= 2; // to make it look shorter - - setDimCache(mi, dim); + if (dim.wid == 0) + dim.wid = fm.width(s); } +namespace { + +// helper function: draw text and update x. +void drawChar(PainterInfo & pi, int & x, int const y, char_type ch) +{ + FontInfo font = pi.base.font; + font.setPaintColor(pi.textColor(font.realColor())); + pi.pain.text(x, y, ch, font); + x += theFontMetrics(font).width(ch); +} + + +void drawLogo(PainterInfo & pi, int & x, int const y, InsetSpecialChar::Kind kind) +{ + FontInfo const & font = pi.base.font; + int const em = theFontMetrics(font).em(); + switch (kind) { + case InsetSpecialChar::PHRASE_LYX: + /** Reference macro: + * \providecommand{\LyX}{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\\@}; + */ + drawChar(pi, x, y, 'L'); + x -= em / 6; + drawChar(pi, x, y + em / 4, 'Y'); + x -= em / 8; + drawChar(pi, x, y, 'X'); + break; + + case InsetSpecialChar::PHRASE_TEX: { + /** Reference macro: + * \def\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@} + */ + int const ex = theFontMetrics(font).ascent('x'); + drawChar(pi, x, y, 'T'); + x -= em / 6; + drawChar(pi, x, y + ex / 2, 'E'); + x -= em / 8; + drawChar(pi, x, y, 'X'); + break; + } + case InsetSpecialChar::PHRASE_LATEX2E: + /** Reference macro: + * \DeclareRobustCommand{\LaTeXe}{\mbox{\m@th + * \if b\expandafter\@car\f@series\@nil\boldmath\fi + * \LaTeX\kern.15em2$_{\textstyle\varepsilon}$}} + */ + drawLogo(pi, x, y, InsetSpecialChar::PHRASE_LATEX); + x += 3 * em / 20; + drawChar(pi, x, y, '2'); + drawChar(pi, x, y + em / 4, char_type(0x03b5)); + break; + + case InsetSpecialChar::PHRASE_LATEX: { + /** Reference macro: + * \DeclareRobustCommand{\LaTeX}{L\kern-.36em% + * {\sbox\z@ T% + * \vbox to\ht\z@{\hbox{\check@mathfonts + * \fontsize\sf@size\z@ + * \math@fontsfalse\selectfont + * A}% + * \vss}% + * }% + * \kern-.15em% + * \TeX} + */ + drawChar(pi, x, y, 'L'); + x -= 9 * em / 25; + PainterInfo pi2 = pi; + pi2.base.font.decSize().decSize(); + drawChar(pi2, x, y - em / 5, 'A'); + x -= 3 * em / 20; + drawLogo(pi, x, y, InsetSpecialChar::PHRASE_TEX); + break; + } + default: + LYXERR0("No information for drawing logo " << kind); + } +} + +} + void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const { FontInfo font = pi.base.font; @@ -143,6 +275,12 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const pi.pain.text(x, y, char_type('-'), font); break; } + case PHRASE_LYX: + case PHRASE_TEX: + case PHRASE_LATEX2E: + case PHRASE_LATEX: + drawLogo(pi, x, y, kind_); + break; } } @@ -153,25 +291,37 @@ void InsetSpecialChar::write(ostream & os) const string command; switch (kind_) { case HYPHENATION: - command = "\\-"; + command = "softhyphen"; break; case LIGATURE_BREAK: - command = "\\textcompwordmark{}"; + command = "ligaturebreak"; break; case END_OF_SENTENCE: - command = "\\@."; + command = "endofsentence"; break; case LDOTS: - command = "\\ldots{}"; + command = "ldots"; break; case MENU_SEPARATOR: - command = "\\menuseparator"; + command = "menuseparator"; break; case SLASH: - command = "\\slash{}"; + command = "breakableslash"; break; case NOBREAKDASH: - command = "\\nobreakdash-"; + command = "nobreakdash"; + break; + case PHRASE_LYX: + command = "LyX"; + break; + case PHRASE_TEX: + command = "TeX"; + break; + case PHRASE_LATEX2E: + command = "LaTeX2e"; + break; + case PHRASE_LATEX: + command = "LaTeX"; break; } os << "\\SpecialChar " << command << "\n"; @@ -184,27 +334,35 @@ void InsetSpecialChar::read(Lexer & lex) lex.next(); string const command = lex.getString(); - if (command == "\\-") + if (command == "softhyphen") kind_ = HYPHENATION; - else if (command == "\\textcompwordmark{}") + else if (command == "ligaturebreak") kind_ = LIGATURE_BREAK; - else if (command == "\\@.") + else if (command == "endofsentence") kind_ = END_OF_SENTENCE; - else if (command == "\\ldots{}") + else if (command == "ldots") kind_ = LDOTS; - else if (command == "\\menuseparator") + else if (command == "menuseparator") kind_ = MENU_SEPARATOR; - else if (command == "\\slash{}") + else if (command == "breakableslash") kind_ = SLASH; - else if (command == "\\nobreakdash-") + else if (command == "nobreakdash") kind_ = NOBREAKDASH; + else if (command == "LyX") + kind_ = PHRASE_LYX; + else if (command == "TeX") + kind_ = PHRASE_TEX; + else if (command == "LaTeX2e") + kind_ = PHRASE_LATEX2E; + else if (command == "LaTeX") + kind_ = PHRASE_LATEX; else lex.printError("InsetSpecialChar: Unknown kind: `$$Token'"); } -int InsetSpecialChar::latex(odocstream & os, - OutputParams const &) const +void InsetSpecialChar::latex(otexstream & os, + OutputParams const & rp) const { switch (kind_) { case HYPHENATION: @@ -220,31 +378,58 @@ int InsetSpecialChar::latex(odocstream & os, os << "\\ldots{}"; break; case MENU_SEPARATOR: - os << "\\lyxarrow{}"; + if (rp.local_font->isRightToLeft()) + os << "\\lyxarrow*{}"; + else + os << "\\lyxarrow{}"; break; case SLASH: os << "\\slash{}"; break; case NOBREAKDASH: + if (rp.moving_arg) + os << "\\protect"; os << "\\nobreakdash-"; break; + case PHRASE_LYX: + if (rp.moving_arg) + os << "\\protect"; + os << "\\LyX{}"; + break; + case PHRASE_TEX: + if (rp.moving_arg) + os << "\\protect"; + os << "\\TeX{}"; + break; + case PHRASE_LATEX2E: + if (rp.moving_arg) + os << "\\protect"; + os << "\\LaTeXe{}"; + break; + case PHRASE_LATEX: + if (rp.moving_arg) + os << "\\protect"; + os << "\\LaTeX{}"; + break; } - return 0; } -int InsetSpecialChar::plaintext(odocstream & os, OutputParams const &) const +int InsetSpecialChar::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { switch (kind_) { case HYPHENATION: - case LIGATURE_BREAK: return 0; + case LIGATURE_BREAK: + os.put(0x200c); + return 1; case END_OF_SENTENCE: os << '.'; return 1; case LDOTS: - os << "..."; - return 3; + os.put(0x2026); + return 1; case MENU_SEPARATOR: os << "->"; return 2; @@ -252,8 +437,21 @@ int InsetSpecialChar::plaintext(odocstream & os, OutputParams const &) const os << '/'; return 1; case NOBREAKDASH: - os << '-'; + os.put(0x2011); return 1; + case PHRASE_LYX: + os << "LyX"; + return 3; + case PHRASE_TEX: + os << "TeX"; + return 3; + case PHRASE_LATEX2E: + os << "LaTeX2"; + os.put(0x03b5); + return 7; + case PHRASE_LATEX: + os << "LaTeX"; + return 5; } return 0; } @@ -269,7 +467,7 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const os << '.'; break; case LDOTS: - os << "..."; + os << "…"; break; case MENU_SEPARATOR: os << "&lyxarrow;"; @@ -280,20 +478,86 @@ int InsetSpecialChar::docbook(odocstream & os, OutputParams const &) const case NOBREAKDASH: os << '-'; break; + case PHRASE_LYX: + os << "LyX"; + break; + case PHRASE_TEX: + os << "TeX"; + break; + case PHRASE_LATEX2E: + os << "LaTeX2"; + os.put(0x03b5); + break; + case PHRASE_LATEX: + os << "LaTeX"; + break; } return 0; } -void InsetSpecialChar::textString(odocstream & os) const +docstring InsetSpecialChar::xhtml(XHTMLStream & xs, OutputParams const &) const { - plaintext(os, OutputParams(0)); + switch (kind_) { + case HYPHENATION: + break; + case LIGATURE_BREAK: + xs << XHTMLStream::ESCAPE_NONE << "‌"; + break; + case END_OF_SENTENCE: + xs << '.'; + break; + case LDOTS: + xs << XHTMLStream::ESCAPE_NONE << "…"; + break; + case MENU_SEPARATOR: + xs << XHTMLStream::ESCAPE_NONE << "⇒"; + break; + case SLASH: + xs << XHTMLStream::ESCAPE_NONE << "⁄"; + break; + case NOBREAKDASH: + xs << XHTMLStream::ESCAPE_NONE << "‑"; + break; + case PHRASE_LYX: + xs << "LyX"; + break; + case PHRASE_TEX: + xs << "TeX"; + break; + case PHRASE_LATEX2E: + xs << "LaTeX2" << XHTMLStream::ESCAPE_NONE << "ε"; + break; + case PHRASE_LATEX: + xs << "LaTeX"; + break; + } + return docstring(); +} + + +void InsetSpecialChar::toString(odocstream & os) const +{ + switch (kind_) { + case LIGATURE_BREAK: + // Do not output ZERO WIDTH NON JOINER here + // Spell checker would choke on it. + return; + default: + break; + } + odocstringstream ods; + plaintext(ods, OutputParams(0)); + os << ods.str(); } -Inset * InsetSpecialChar::clone() const +void InsetSpecialChar::forOutliner(docstring & os, size_t const, + bool const) const { - return new InsetSpecialChar(kind_); + odocstringstream ods; + plaintext(ods, OutputParams(0)); + os += ods.str(); } @@ -303,18 +567,15 @@ void InsetSpecialChar::validate(LaTeXFeatures & features) const features.require("lyxarrow"); if (kind_ == NOBREAKDASH) features.require("amsmath"); -} - - -bool InsetSpecialChar::isChar() const -{ - return true; + if (kind_ == PHRASE_LYX) + features.require("LyX"); } bool InsetSpecialChar::isLetter() const { - return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK; + return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK + || kind_ == NOBREAKDASH; } @@ -325,7 +586,8 @@ bool InsetSpecialChar::isLineSeparator() const // Paragraph::stripLeadingSpaces nukes the characters which // have this property. I leave the code here, since it should // eventually be made to work. (JMarc 20020327) - return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR; + return kind_ == HYPHENATION || kind_ == MENU_SEPARATOR + || kind_ == SLASH; #else return false; #endif