X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetspecialchar.C;h=7ed1ea8489cbae9250b301601e10480647e119c3;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=fd4181bc6c0048be6af520602f974cd536aa37a1;hpb=55bf6460f304a4632af2136a62c8a82fb86053f3;p=lyx.git diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C index fd4181bc6c..7ed1ea8489 100644 --- a/src/insets/insetspecialchar.C +++ b/src/insets/insetspecialchar.C @@ -1,27 +1,35 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1997 Asger Alstrup +/** + * \file insetspecialchar.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * ====================================================== */ + * \author Asger Alstrup Nielsen + * \author Jean-Marc Lasgouttes + * \author Lars Gullik Bjønnes + * + * Full author contact details are available in file CREDITS. + */ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "insetspecialchar.h" + #include "debug.h" #include "LaTeXFeatures.h" -#include "BufferView.h" -#include "Painter.h" -#include "font.h" +#include "LColor.h" +#include "lyxlex.h" +#include "metricsinfo.h" + +#include "frontends/FontMetrics.h" +#include "frontends/Painter.h" + +namespace lyx { + +using std::string; +using std::auto_ptr; using std::ostream; -using std::max; + InsetSpecialChar::InsetSpecialChar(Kind k) : kind_(k) @@ -33,126 +41,80 @@ InsetSpecialChar::Kind InsetSpecialChar::kind() const return kind_; } -int InsetSpecialChar::ascent(BufferView *, LyXFont const & font) const -{ - return lyxfont::maxAscent(font); -} - -int InsetSpecialChar::descent(BufferView *, LyXFont const & font) const +bool InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const { - return lyxfont::maxDescent(font); -} - + frontend::FontMetrics const & fm = + theFontMetrics(mi.base.font); + dim.asc = fm.maxAscent(); + dim.des = fm.maxDescent(); -int InsetSpecialChar::width(BufferView *, LyXFont const & font) const -{ + string s; switch (kind_) { - case HYPHENATION: - { - int w = lyxfont::width('-', font); - if (w > 5) - w -= 2; // to make it look shorter - return w; + case LIGATURE_BREAK: s = "|"; break; + case END_OF_SENTENCE: s = "."; break; + case LDOTS: s = ". . ."; break; + case MENU_SEPARATOR: s = " x "; break; + case HYPHENATION: s = "-"; break; } - case LIGATURE_BREAK: - { - return lyxfont::width('|', font); - } - case END_OF_SENTENCE: - { - return lyxfont::width('.', font); - } - case LDOTS: - { - return lyxfont::width(". . .", font); - } - case MENU_SEPARATOR: - { - return lyxfont::width(" x ", font); - } - case PROTECTED_SEPARATOR: - { - return lyxfont::width('x', font); - } - - } - return 1; // To shut up gcc + 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 + bool const changed = dim_ != dim; + dim_ = dim; + return changed; } -void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f, - int baseline, float & x, bool) const +void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const { - Painter & pain = bv->painter(); - LyXFont font(f); + LyXFont font = pi.base.font; switch (kind_) { case HYPHENATION: { font.setColor(LColor::special); - pain.text(int(x), baseline, "-", font); - x += width(bv, font); + pi.pain.text(x, y, char_type('-'), font); break; } case LIGATURE_BREAK: { font.setColor(LColor::special); - pain.text(int(x), baseline, "|", font); - x += width(bv, font); + pi.pain.text(x, y, char_type('|'), font); break; } case END_OF_SENTENCE: { font.setColor(LColor::special); - pain.text(int(x), baseline, ".", font); - x += width(bv, font); + pi.pain.text(x, y, char_type('.'), font); break; } case LDOTS: { font.setColor(LColor::special); - pain.text(int(x), baseline, ". . .", font); - x += width(bv, font); + string ell = ". . . "; + docstring dell(ell.begin(), ell.end()); + pi.pain.text(x, y, dell, font); break; } case MENU_SEPARATOR: { + frontend::FontMetrics const & fm = + theFontMetrics(font); + // A triangle the width and height of an 'x' - int w = lyxfont::width('x', font); - int ox = lyxfont::width(' ', font) + int(x); - int h = lyxfont::ascent('x', font); + 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] = baseline; - xp[1] = ox; yp[1] = baseline - h; - xp[2] = ox + w; yp[2] = baseline - h/2; - xp[3] = ox; yp[3] = baseline; - - pain.lines(xp, yp, 4, LColor::special); - x += width(bv, font); - break; - } - case PROTECTED_SEPARATOR: - { - float w = width(bv, font); - int h = lyxfont::ascent('x', font); - int xp[4], yp[4]; - - xp[0] = int(x); - yp[0] = baseline - max(h / 4, 1); - - xp[1] = int(x); - yp[1] = baseline; - xp[2] = int(x + w); - yp[2] = baseline; + 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; - xp[3] = int(x + w); - yp[3] = baseline - max(h / 4, 1); - - pain.lines(xp, yp, 4, LColor::special); - x += w; + pi.pain.lines(xp, yp, 4, LColor::special); break; } } @@ -160,28 +122,24 @@ void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f, // In lyxf3 this will be just LaTeX -void InsetSpecialChar::write(Buffer const *, ostream & os) const +void InsetSpecialChar::write(Buffer const &, ostream & os) const { string command; switch (kind_) { - case HYPHENATION: - command = "\\-"; + case HYPHENATION: + command = "\\-"; break; - case LIGATURE_BREAK: - command = "\\textcompwordmark{}"; + case LIGATURE_BREAK: + command = "\\textcompwordmark{}"; break; - case END_OF_SENTENCE: + case END_OF_SENTENCE: command = "\\@."; break; case LDOTS: - command = "\\ldots{}"; + command = "\\ldots{}"; break; case MENU_SEPARATOR: - command = "\\menuseparator"; - break; - case PROTECTED_SEPARATOR: - //command = "\\protected_separator"; - command = "~"; + command = "\\menuseparator"; break; } os << "\\SpecialChar " << command << "\n"; @@ -189,10 +147,10 @@ void InsetSpecialChar::write(Buffer const *, ostream & os) const // This function will not be necessary when lyx3 -void InsetSpecialChar::read(Buffer const *, LyXLex & lex) -{ - lex.nextToken(); - string const command = lex.GetString(); +void InsetSpecialChar::read(Buffer const &, LyXLex & lex) +{ + lex.next(); + string const command = lex.getString(); if (command == "\\-") kind_ = HYPHENATION; @@ -203,86 +161,123 @@ void InsetSpecialChar::read(Buffer const *, LyXLex & lex) else if (command == "\\ldots{}") kind_ = LDOTS; else if (command == "\\menuseparator") - kind_ = MENU_SEPARATOR; - else if (command == "\\protected_separator" - || command == "~") - kind_ = PROTECTED_SEPARATOR; + kind_ = MENU_SEPARATOR; else lex.printError("InsetSpecialChar: Unknown kind: `$$Token'"); } -int InsetSpecialChar::latex(Buffer const *, ostream & os, bool /*fragile*/, - bool free_space) const +int InsetSpecialChar::latex(Buffer const &, odocstream & os, + OutputParams const &) const { switch (kind_) { - case HYPHENATION: - os << "\\-"; + case HYPHENATION: + os << "\\-"; break; case LIGATURE_BREAK: os << "\\textcompwordmark{}"; break; - case END_OF_SENTENCE: - os << "\\@."; - break; - case LDOTS: - os << "\\ldots{}"; + case END_OF_SENTENCE: + os << "\\@."; break; - case MENU_SEPARATOR: - os << "\\lyxarrow{}"; + case LDOTS: + os << "\\ldots{}"; break; - case PROTECTED_SEPARATOR: - os << (free_space ? " " : "~"); + case MENU_SEPARATOR: + os << "\\lyxarrow{}"; break; } return 0; } -int InsetSpecialChar::ascii(Buffer const *, ostream & os, int) const +int InsetSpecialChar::plaintext(Buffer const &, odocstream & os, + OutputParams const &) const { switch (kind_) { case HYPHENATION: case LIGATURE_BREAK: break; - case END_OF_SENTENCE: - os << "."; - break; - case LDOTS: - os << "..."; + case END_OF_SENTENCE: + os << '.'; break; - case MENU_SEPARATOR: - os << "->"; + case LDOTS: + os << "..."; break; - case PROTECTED_SEPARATOR: - os << " "; + case MENU_SEPARATOR: + os << "->"; break; } return 0; } -int InsetSpecialChar::linuxdoc(Buffer const * buf, ostream & os) const +int InsetSpecialChar::docbook(Buffer const &, odocstream & os, + OutputParams const &) const { - return ascii(buf, os, 0); + switch (kind_) { + case HYPHENATION: + case LIGATURE_BREAK: + break; + case END_OF_SENTENCE: + os << '.'; + break; + case LDOTS: + os << "..."; + break; + case MENU_SEPARATOR: + os << "&lyxarrow;"; + break; + } + return 0; } -int InsetSpecialChar::docBook(Buffer const * buf, ostream & os) const +int InsetSpecialChar::textString(Buffer const & buf, odocstream & os, + OutputParams const & op) const { - return ascii(buf, os, 0); + return plaintext(buf, os, op); } -Inset * InsetSpecialChar::clone(Buffer const &, bool) const +auto_ptr InsetSpecialChar::doClone() const { - return new InsetSpecialChar(kind_); + return auto_ptr(new InsetSpecialChar(kind_)); } void InsetSpecialChar::validate(LaTeXFeatures & features) const { if (kind_ == MENU_SEPARATOR) { - features.lyxarrow = true; + features.require("lyxarrow"); } } + + +bool InsetSpecialChar::isChar() const +{ + return true; +} + + +bool InsetSpecialChar::isLetter() const +{ + return kind_ == HYPHENATION || kind_ == LIGATURE_BREAK; +} + + +bool InsetSpecialChar::isLineSeparator() const +{ +#if 0 + // this would be nice, but it does not work, since + // 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; +#else + return false; +#endif +} + + +} // namespace lyx