X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetlatexaccent.C;h=94c1e2b19c0757d3e573aefdb98a01c2f925b77e;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=81d4f3074ccc15d548f58d69ae0fac791edeb409;hpb=75c5c8c9e51469822100d70a1ead0d7f8d3f69de;p=lyx.git diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C index 81d4f3074c..94c1e2b19c 100644 --- a/src/insets/insetlatexaccent.C +++ b/src/insets/insetlatexaccent.C @@ -1,171 +1,150 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. +/** + * \file insetlatexaccent.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * ====================================================== */ + * \author Lars Gullik Bjønnes + * + * Full author contact details are available in file CREDITS. + */ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "insetlatexaccent.h" + #include "debug.h" +#include "language.h" +#include "LColor.h" +#include "lyxlex.h" #include "lyxrc.h" -#include "lyxdraw.h" +#include "metricsinfo.h" + +#include "frontends/FontMetrics.h" +#include "frontends/Painter.h" + #include "support/lstrings.h" -extern LyXRC * lyxrc; + +namespace lyx { + +using support::contains; +using support::trim; + +using std::endl; +using std::string; +using std::auto_ptr; +using std::ostream; + /* LatexAccent. Proper handling of accented characters */ /* This part is done by Ivan Schreter, schreter@ccsun.tuke.sk */ -/* Later modified by Lars G. Bjonnes, larsbj@ifi.uio.no */ +/* Later modified by Lars G. Bjønnes, larsbj@lyx.org */ InsetLatexAccent::InsetLatexAccent() -{ - candisp = false; -} - - -InsetLatexAccent::InsetLatexAccent(InsetLatexAccent const & other) - : contents(other.contents), - candisp(other.candisp), - modtype(other.modtype), - remdot(other.remdot), - plusasc(other.plusasc), - plusdesc(other.plusdesc), - ic(other.ic) + : candisp(false) {} -InsetLatexAccent::InsetLatexAccent(string const & string) - : contents(string) +InsetLatexAccent::InsetLatexAccent(string const & str) + : contents(str) { checkContents(); } +auto_ptr InsetLatexAccent::doClone() const +{ + return auto_ptr(new InsetLatexAccent(contents)); +} + + void InsetLatexAccent::checkContents() - // check, if we know the modifier and can display it ok on screen + // check, if we know the modifier and can display it ok on screen { - candisp = false; - - if (contents.empty() || contents.length() < 2) return; - - // REMOVE IN 0.13 - // Dirty Hack for backward compability. remove in 0.13 (Lgb) - contents = frontStrip(strip(contents)); - if (!contains(contents, "{") && !contains(contents, "}")) { - if (contents.length() == 2) { - string tmp; - tmp += contents[0]; - tmp += contents[1]; - tmp += "{}"; - contents = tmp; - } else if (contents.length() == 3) { - string tmp; - tmp += contents[0]; - tmp += contents[1]; - tmp += '{'; - tmp += contents[2]; - tmp += '}'; - contents = tmp; - } else if (contents.length() == 4 && contents[2] == ' ') { - string tmp; - tmp += contents[0]; - tmp += contents[1]; - tmp += '{'; - tmp += contents[3]; - tmp += '}'; - contents = tmp; - } else if (contents.length() == 4 && contents[2] == '\\' - && (contents[3] == 'i' || contents[3] == 'j')) { - string tmp; - tmp += contents[0]; - tmp += contents[1]; - tmp += '{'; - tmp += contents[2]; - tmp += contents[3]; - tmp += '}'; - contents = tmp; - } + candisp = false; + + if (contents.empty() || contents.length() < 2) { + lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl; + return; } - if (contents[0] != '\\') return; // demand that first char is a '\\' - lyxerr.debug() << "Decode: " << contents << endl; + contents = trim(contents); + if (contents[0] != '\\') { // demand that first char is a '\\' + lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl; + return; + } - remdot = false; plusasc = false; plusdesc = false; + lyxerr[Debug::KEY] << "Decode: " << contents << endl; - switch (contents[1]) { // second char should be one of these + remdot = false; + plusasc = false; + plusdesc = false; + + switch (contents[1]) { // second char should be one of these case '\'': // acute - modtype = ACUTE; // acute - plusasc = true; // at the top of character - break; + modtype = ACUTE; // acute + plusasc = true; // at the top of character + break; case '`': // grave - modtype = GRAVE; // grave - plusasc = true; // at the top - break; + modtype = GRAVE; // grave + plusasc = true; // at the top + break; case '=': // macron - modtype = MACRON; // macron - plusasc = true; // at the top - break; + modtype = MACRON; // macron + plusasc = true; // at the top + break; case '~': // tilde - modtype = TILDE; // tilde - plusasc = true; // at the top - break; + modtype = TILDE; // tilde + plusasc = true; // at the top + break; case 'b': // underbar - modtype = UNDERBAR; // underbar - plusdesc = true; // at the bottom - break; + modtype = UNDERBAR; // underbar + plusdesc = true; // at the bottom + break; case 'c': // cedilla - modtype = CEDILLA; // cedilla - plusdesc = true; // at the bottom - break; + modtype = CEDILLA; // cedilla + plusdesc = true; // at the bottom + break; case 'd': // underdot - modtype = UNDERDOT; // underdot - plusdesc = true; // at the bottom - break; + modtype = UNDERDOT; // underdot + plusdesc = true; // at the bottom + break; case 'r': // circle - modtype = CIRCLE; // circle - plusasc = true; // at the top - break; + modtype = CIRCLE; // circle + plusasc = true; // at the top + break; case 't': // tie - modtype = TIE; // tie - plusasc = true; // at the top - break; + modtype = TIE; // tie + plusasc = true; // at the top + break; case 'u': // breve - modtype = BREVE; // breve - plusasc = true; // at the top - break; + modtype = BREVE; // breve + plusasc = true; // at the top + break; case 'v': // caron - modtype = CARON; // caron - plusasc = true; // at the top - break; + modtype = CARON; // caron + plusasc = true; // at the top + break; case 'q': // special caron - modtype = SPECIAL_CARON; // special caron - plusasc = true; // at the top - break; + modtype = SPECIAL_CARON; // special caron + plusasc = true; // at the top + break; case 'H': // hungarian umlaut - modtype = HUNGARIAN_UMLAUT; // hungarian umlaut - plusasc = true; // at the top - break; + modtype = HUNGARIAN_UMLAUT; // hungarian umlaut + plusasc = true; // at the top + break; case '"': // umlaut - modtype = UMLAUT; // umlaut - plusasc = true; // at the top - break; + modtype = UMLAUT; // umlaut + plusasc = true; // at the top + break; case '.': // dot - modtype = DOT; // dot - plusasc = true; // at the top - break; + modtype = DOT; // dot + plusasc = true; // at the top + break; case '^': // circumflex - modtype = CIRCUMFLEX; // circumflex - plusasc = true; // at the top - break; + modtype = CIRCUMFLEX; // circumflex + plusasc = true; // at the top + break; case 'k': // ogonek modtype = OGONEK; // ogonek plusdesc = true; @@ -180,27 +159,27 @@ void InsetLatexAccent::checkContents() plusasc = true; // at the top (not really needed) remdot = true; break; - case 'l': // lslash - modtype = lSLASH; - plusasc = true; // at the top (not really needed) - break; - case 'L': // lslash - modtype = LSLASH; - plusasc = true; // at the top (not really needed) - break; + case 'l': // lslash + modtype = lSLASH; + plusasc = true; // at the top (not really needed) + break; + case 'L': // lslash + modtype = LSLASH; + plusasc = true; // at the top (not really needed) + break; default: - printf ("Default\n"); - // unknow accent (or something else) - return; - } + lyxerr[Debug::KEY] << "Default" << endl; + // unknown accent (or something else) + return; + } // we demand that third char is a '{' (Lgb) if (contents[2] != '{') return; // special clause for \i{}, \j{} \l{} and \L{} if ((modtype == DOT_LESS_I || modtype == DOT_LESS_J - || modtype == lSLASH || modtype == LSLASH) - && contents[3] == '}' ) { + || modtype == lSLASH || modtype == LSLASH) + && contents[3] == '}') { switch (modtype) { case DOT_LESS_I: ic = 'i'; break; case DOT_LESS_J: ic = 'j'; break; @@ -212,18 +191,18 @@ void InsetLatexAccent::checkContents() break; } //ic = (modtype == DOT_LESS_J ? 'j' : 'i'); - lyxerr.debug() << "Contents: [" << contents << "]" - << ", ic: " << ic - << ", top: " << plusasc - << ", bot: " << plusdesc - << ", dot: " << remdot - << ", mod: " << modtype << endl; - // Special case for space + lyxerr[Debug::KEY] << "Contents: [" << contents << ']' + << ", ic: " << ic + << ", top: " << plusasc + << ", bot: " << plusdesc + << ", dot: " << remdot + << ", mod: " << modtype << endl; + // Special case for space } else if (contents[3] == '}') { ic = ' '; } else { int i = 3; - + // now get the char ic = contents[3]; // i will always be 3 here @@ -234,411 +213,407 @@ void InsetLatexAccent::checkContents() remdot = true; else return; - } else if ( (ic == 'i'|| ic == 'j') && contents[4] == '}') { - // Do a rewrite: \{i} --> \{\i} - string temp = contents; - temp.erase(3, string::npos); - temp += '\\'; - temp += char(ic); - for(string::size_type j = 4; j < contents.length(); ++j) + } else if ((ic == 'i'|| ic == 'j') && contents[4] == '}') { + // Do a rewrite: \{i} --> \{\i} + string temp = contents; + temp.erase(3, string::npos); + temp += '\\'; + temp += char(ic); + for (string::size_type j = 4; + j < contents.length(); ++j) temp+= contents[j]; - contents= temp; - ++i; + contents= temp; + ++i; remdot = true; - } + } // demand a '}' at the end if (contents[++i] != '}' && contents[++i]) return; - + // fine, the char is properly decoded now (hopefully) - lyxerr.debug() << "Contents: [" << contents << "]" - << ", ic: " << ic - << ", top: " << plusasc - << ", bot: " << plusdesc - << ", dot: " << remdot - << ", mod: " << modtype << endl; + lyxerr[Debug::KEY] << "Contents: [" << contents << ']' + << ", ic: " << ic + << ", top: " << plusasc + << ", bot: " << plusdesc + << ", dot: " << remdot + << ", mod: " << modtype << endl; } - candisp = true; + candisp = true; } -int InsetLatexAccent::Ascent(LyXFont const & font) const +bool InsetLatexAccent::metrics(MetricsInfo & mi, Dimension & dim) const { - int max; + LyXFont & font = mi.base.font; + frontend::FontMetrics const & fm = theFontMetrics(font); + + // This function is a bit too simplistic and is just a + // "try to make a fit for all accents" approach, to + // make it better we need to know what kind of accent is + // used and add to max based on that. if (candisp) { if (ic == ' ') - max = font.ascent('a'); + dim.asc = fm.ascent('a'); else - max = font.ascent(ic); - if (plusasc) - max += (font.maxAscent() + 3) / 3; - } else - max = font.maxAscent() + 4; - return max; -} - - -int InsetLatexAccent::Descent(LyXFont const & font) const -{ - int max; - if (candisp) { - if (ic == ' ') - max = font.descent('a'); - else - max = font.descent(ic); - if (plusdesc) - max += 3; - } else - max = font.maxDescent() + 4; - return max; -} + dim.asc = fm.ascent(ic); + if (plusasc) + dim.asc += (fm.maxAscent() + 3) / 3; + if (ic == ' ') + dim.des = fm.descent('a'); + else + dim.des = fm.descent(ic); + if (plusdesc) + dim.des += 3; -int InsetLatexAccent::Width(LyXFont const & font) const -{ - if (candisp) - return font.textWidth(&ic, 1); - else - return font.stringWidth(contents) + 4; + dim.wid = fm.width(ic); + } else { + dim.asc = fm.maxAscent() + 4; + dim.des = fm.maxDescent() + 4; + docstring dcon(contents.begin(), contents.end()); + dim.wid = fm.width(dcon) + 4; + } + bool const changed = dim_ != dim; + dim_ = dim; + return changed; } -bool InsetLatexAccent::DisplayISO8859_9(LyXFont font, - LyXScreen & scr, - int baseline, - float & x) +bool InsetLatexAccent::displayISO8859_9(PainterInfo & pi, int x, int y) const { unsigned char tmpic = ic; - + switch (modtype) { - case CEDILLA: - { - if (ic == 'c') tmpic = 0xe7; - if (ic == 'C') tmpic = 0xc7; - if (ic == 's') tmpic = 0xfe; - if (ic == 'S') tmpic = 0xde; + + case CEDILLA: { + if (ic == 'c') tmpic = '\xe7'; + if (ic == 'C') tmpic = '\xc7'; + if (ic == 's') tmpic = '\xfe'; + if (ic == 'S') tmpic = '\xde'; break; } - case BREVE: - { if (ic == 'g') tmpic = 0xf0; - if (ic == 'G') tmpic = 0xd0; + + case BREVE: { + if (ic == 'g') tmpic = '\xf0'; + if (ic == 'G') tmpic = '\xd0'; break; } - case UMLAUT: - { - if (ic == 'o') tmpic = 0xf6; - if (ic == 'O') tmpic = 0xd6; - if (ic == 'u') tmpic = 0xfc; - if (ic == 'U') tmpic = 0xdc; + + case UMLAUT: { + if (ic == 'o') tmpic = '\xf6'; + if (ic == 'O') tmpic = '\xd6'; + if (ic == 'u') tmpic = '\xfc'; + if (ic == 'U') tmpic = '\xdc'; break; } - case DOT: if (ic == 'I') tmpic = 0xdd; break; - case DOT_LESS_I: tmpic = 0xfd; break; - default: return false; - } - if (tmpic != ic) { - char ch = char(tmpic); - scr.drawText(font, &ch, 1, baseline, int(x)); - x += Width (font); - return true; + + case DOT: + if (ic == 'I') tmpic = '\xdd'; + break; + + case DOT_LESS_I: + tmpic = '\xfd'; + break; + + default: + return false; } - else + + if (tmpic == ic) return false; + + pi.pain.text(x, y, char(tmpic), pi.base.font); + return true; } -void InsetLatexAccent::Draw(LyXFont font, - LyXScreen & scr, - int baseline, - float & x) +void InsetLatexAccent::drawAccent(PainterInfo const & pi, int x, int y, + char_type accent) const { - if (lyxrc->font_norm == "iso8859-9") - if (DisplayISO8859_9 (font, scr, baseline, x)) + LyXFont const & font = pi.base.font; + frontend::FontMetrics const & fm = theFontMetrics(font); + + x -= fm.center(accent); + y -= fm.ascent(ic); + y -= fm.descent(accent); + y -= fm.height(accent) / 2; + pi.pain.text(x, y, accent, font); +} + + +void InsetLatexAccent::draw(PainterInfo & pi, int x, int baseline) const +{ + if (lyxrc.font_norm_type == LyXRC::ISO_8859_9) + if (displayISO8859_9(pi, x, baseline)) return; - - /* draw it! */ - + + // All the manually drawn accents in this function could use an + // overhaul. Different ways of drawing (what metrics to use) + // should also be considered. + + LyXFont font = pi.base.font; + if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) + font.setLanguage(english_language); + + frontend::FontMetrics const & fm = theFontMetrics(font); + if (candisp) { - int asc = Ascent(font); - int desc = Descent(font); - int wid = Width(font); - float x2 = x + float(wid/2); - float hg35; - int hg, y; + int x2 = int(x + (fm.rbearing(ic) - fm.lbearing(ic)) / 2); + int hg; + int y; if (plusasc) { // mark at the top - hg = font.maxDescent(); - y = baseline - asc; - - if (font.shape() == LyXFont::ITALIC_SHAPE) x2 += (4*hg)/5; // italic + hg = fm.maxDescent(); + y = baseline - dim_.asc; + if (font.shape() == LyXFont::ITALIC_SHAPE) + x2 += int(0.8 * hg); // italic } else { // at the bottom - hg = desc; + hg = dim_.des; y = baseline; } - hg35 = float(hg*3)/5; + double hg35 = hg * 0.6; // display with proper accent mark // first the letter - scr.drawText(font, &ic, 1, baseline, int(x)); - - GC pgc = GetAccentGC(font, (hg+3)/5); + pi.pain.text(x, baseline, ic, font); if (remdot) { - int tmpvar = baseline - font.ascent('i'); - float tmpx = 0; - if (font.shape() == LyXFont::ITALIC_SHAPE) tmpx += (8*hg)/10; // italic - lyxerr.debug() << "Removing dot." << endl; + int tmpvar = baseline - fm.ascent('i'); + int tmpx = 0; + if (font.shape() == LyXFont::ITALIC_SHAPE) + tmpx += int(0.8 * hg); // italic + lyxerr[Debug::KEY] << "Removing dot." << endl; // remove the dot first - scr.fillRectangle(gc_clear, int(x + tmpx), - tmpvar, wid, - font.ascent('i') - - font.ascent('x')-1); - + pi.pain.fillRectangle(x + tmpx, tmpvar, dim_.wid, + fm.ascent('i') - + fm.ascent('x') - 1, + backgroundColor()); + // the five lines below is a simple hack to + // make the display of accent 'i' and 'j' + // better. It makes the accent be written + // closer to the top of the dot-less 'i' or 'j'. + char tmpic = ic; // store the ic when we + ic = 'x'; // calculates the ascent of +#ifdef WITH_WARNINGS +#warning metrics? +#endif + int asc = ascent(); // the dot-less version (here: 'x') + ic = tmpic; // set the orig ic back + y = baseline - asc; // update to new y coord. } - // now the rest - draw within (x, y, x+wid, y+hg) + + // now the rest - draw within (x, y, x + wid, y + hg) switch (modtype) { - case ACUTE: // acute - { - scr.drawLine(pgc, int(x2), int(y+hg35), - int(x2+hg35), y); + case ACUTE: + //drawAccent(pi, x2, baseline, '\xB4'); + drawAccent(pi, x2, baseline, 0xB4); break; - } - case GRAVE: // grave - { - scr.drawLine(pgc, int(x2), int(y+hg35), - int(x2-hg35), y); + + case GRAVE: + //drawAccent(pi, x2, baseline, '\x60'); + drawAccent(pi, x2, baseline, 0x60); break; - } - case MACRON: // macron - { - scr.drawLine(pgc, - int(x2-(3*wid/7)), int(y+(hg/2) + hg35), - int(x2+(3*wid/7)), int(y+(hg/2) + hg35)); + + case MACRON: + //drawAccent(pi, x2, baseline, '\xAF'); + drawAccent(pi, x2, baseline, 0xAF); break; - } - case TILDE: // tilde - { - if (hg35 > 2) --hg35; - x2 += (hg35/2); - XPoint p[4]; - p[0].x = int(x2 - 2*hg35); p[0].y = int(y + hg); - p[1].x = int(x2 - hg35); p[1].y = int(y + hg35); - p[2].x = int(x2); p[2].y = int(y + hg); - p[3].x = int(x2 + hg35); p[3].y = int(y + hg35); - scr.drawLines(pgc, p, 4); + + case TILDE: + drawAccent(pi, x2, baseline, '~'); break; - } - case UNDERBAR: // underbar - { - scr.drawLine(pgc, - int(x2-(3*wid/7)), y+(hg/2), - int(x2+(3*wid/7)), y+(hg/2)); + + case UNDERBAR: { + char_type const underbar = 0x5F; //('\x5F'); + pi.pain.text(x2 - fm.center(underbar), + baseline, underbar, font); break; } - case CEDILLA: // cedilla - { - XPoint p[4]; - p[0].x = int(x2); p[0].y = y; - p[1].x = int(x2); p[1].y = y + (hg/3); - p[2].x = int(x2 + (hg/3)); p[2].y = y + (hg/2); - p[3].x = int(x2 - (hg/4)); p[3].y = y + hg; - scr.drawLines(pgc, p, 4); + + case CEDILLA: { + char_type const cedilla = 0xB8; //('\xB8'); + pi.pain.text(x2 - fm.center(cedilla), + baseline, cedilla, font); break; } - case UNDERDOT: // underdot - case DOT: // dot - { - scr.drawArc(pgc, int(x2), y+(hg/2), - 1, 1, 0, 360*64); + + case UNDERDOT: + pi.pain.text(x2 - fm.center('.'), + int(baseline + 1.5 * fm.height('.')), + '.', font); break; - } - case CIRCLE: // circle - { - scr.drawArc(pgc, int(x2-(hg/2)), y, hg, hg, 0, - 360*64); + + case DOT: + drawAccent(pi, x2, baseline, '.'); break; - } - case TIE: // tie - { - scr.drawArc(pgc, - int(x2), y+(hg/4), - hg, hg, 0, 11519); + + case CIRCLE: + //drawAccent(pi, x2, baseline, '\xB0'); + drawAccent(pi, x2, baseline, 0xB0); break; - } - case BREVE: // breve - { - scr.drawArc(pgc, - int(x2-(hg/2)), y-(hg/4), - hg, hg, 0, -11519); + + case TIE: + pi.pain.arc(int(x2 + hg35), y + hg / 2, 2 * hg, hg, 0, 360 * 32, + LColor::foreground); break; - } - case CARON: // caron - { - XPoint p[3]; - p[0].x = int(x2 - hg35); p[0].y = y; - p[1].x = int(x2); p[1].y = int(y+hg35); - p[2].x = int(x2 + hg35); p[2].y = y; - scr.drawLines(pgc, p, 3); + + case BREVE: + pi.pain.arc(int(x2 - hg / 2), y, hg, hg, 0, -360*32, + LColor::foreground); + break; + + case CARON: { + int xp[3], yp[3]; + xp[0] = int(x2 - hg35); yp[0] = int(y + hg35); + xp[1] = int(x2); yp[1] = int(y + hg); + xp[2] = int(x2 + hg35); yp[2] = int(y + hg35); + pi.pain.lines(xp, yp, 3, LColor::foreground); break; } - case SPECIAL_CARON: // special caron - { + + case SPECIAL_CARON: { switch (ic) { - case 'L': wid = 4*wid/5; break; - case 't': y -= int(hg35/2); break; + case 'L': dim_.wid = int(4.0 * dim_.wid / 5.0); break; + case 't': y -= int(hg35 / 2.0); break; } - XPoint p[3]; - p[0].x = int(x+wid); p[0].y = int(y+hg35+hg); - p[1].x = int(x+wid+(hg35/2)); p[1].y = int(y+ hg+(hg35/2)); - p[2].x = int(x+wid+(hg35/2)); p[2].y = y + hg; - scr.drawLines(pgc, p, 3); + int xp[3], yp[3]; + xp[0] = int(x + dim_.wid); + yp[0] = int(y + hg35 + hg); + + xp[1] = int(x + dim_.wid + (hg35 / 2.0)); + yp[1] = int(y + hg + (hg35 / 2.0)); + + xp[2] = int(x + dim_.wid + (hg35 / 2.0)); + yp[2] = y + int(hg); + + pi.pain.lines(xp, yp, 3, LColor::foreground); break; } - case HUNGARIAN_UMLAUT: // hung. umlaut - { - XSegment s[2]; - s[0].x1= int(x2-(hg/2)); s[0].y1 = int(y + hg35); - s[0].x2= int(x2+hg35-(hg/2)); s[0].y2 = y; - s[1].x1= int(x2+(hg/2)); s[1].y1 = int(y + hg35); - s[1].x2= int(x2+hg35+(hg/2)); s[1].y2 = y; - - scr.drawSegments(pgc, s, 2); + + case HUNGARIAN_UMLAUT: + drawAccent(pi, x2, baseline, 0x02DD); break; - } - case UMLAUT: // umlaut - { - int tmpadd = y; - tmpadd += (remdot) ? ((19*hg)/10) : ((20*hg)/27); // if (remdot) -> i or j - int rad = ((hg*4)/8); - if (rad <= 1) { - scr.drawPoint(pgc, int(x2-((4*hg)/7)), tmpadd); - scr.drawPoint(pgc, int(x2+((4*hg)/7)), tmpadd); - } else { - scr.drawArc(pgc, int(x2-((2*hg)/4)), tmpadd, - rad-1, rad-1, 0, 360*64); - scr.drawArc(pgc, int(x2+((2*hg)/4)), tmpadd, - rad-1, rad-1, 0, 360*64); - } + + case UMLAUT: + drawAccent(pi, x2, baseline, '"'); break; - } - case CIRCUMFLEX: // circumflex - { - XPoint p[3]; - p[0].x = int(x2 - hg35); p[0].y = y + hg; - p[1].x = int(x2); p[1].y = int(y + hg35); - p[2].x = int(x2 + hg35); p[2].y = y + hg; - scr.drawLines(pgc, p, 3); + + case CIRCUMFLEX: + drawAccent(pi, x2, baseline, '\x5E'); break; - } - case OGONEK: // ogonek - { + + case OGONEK: { // this does probably not look like an ogonek, so // it should certainly be refined - XPoint p[4]; - p[0].x = int(x2); p[0].y = y; - p[1].x = int(x2); p[1].y = y + (hg/3); - p[2].x = int(x2 - (hg/3)); p[2].y = y + (hg/2); - p[3].x = int(x2 + (hg/4)); p[3].y = y + hg; - scr.drawLines(pgc, p, 4); + int xp[4], yp[4]; + + xp[0] = x2; + yp[0] = y; + + xp[1] = x2; + yp[1] = y + int(hg35); + + xp[2] = int(x2 - hg35); + yp[2] = y + hg / 2; + + xp[3] = x2 + hg / 4; + yp[3] = y + int(hg); + + pi.pain.lines(xp, yp, 4, LColor::foreground); break; } + case lSLASH: - case LSLASH: - { - XPoint p[2]; - p[0].x = int(x); p[0].y = y+3*hg; - p[1].x = int(x+float(wid)*.75); p[1].y = y+hg; - scr.drawLines(pgc, p, 2); - break; + case LSLASH: { + int xp[2], yp[2]; + + xp[0] = x; + yp[0] = y + int(3 * hg); + + xp[1] = int(x + dim_.wid * 0.75); + yp[1] = y + int(hg); + + pi.pain.lines(xp, yp, 2, LColor::foreground); + break; } + case DOT_LESS_I: // dotless-i case DOT_LESS_J: // dotless-j - { // nothing to do for these break; } - } + } else { - scr.fillRectangle(gc_lighted, - int(x+1), baseline - Ascent(font)+1, - Width(font)-2, - Ascent(font)+Descent(font)-2); - - scr.drawRectangle(gc_lighted, - int(x), baseline - Ascent(font), - Width(font)-1, - Ascent(font)+Descent(font)-1); - scr.drawString(font, contents, baseline, int(x+2)); + pi.pain.fillRectangle(x + 1, + baseline - dim_.asc + 1, dim_.wid - 2, + dim_.asc + dim_.des - 2, + backgroundColor()); + pi.pain.rectangle(x + 1, baseline - dim_.asc + 1, + dim_.wid - 2, dim_.asc + dim_.des - 2, + LColor::foreground); + docstring dcon(contents.begin(), contents.end()); + pi.pain.text(x + 2, baseline, dcon, font); } - x += Width(font); } -void InsetLatexAccent::Write(ostream & os) +void InsetLatexAccent::write(Buffer const &, ostream & os) const { os << "\\i " << contents << "\n"; } -void InsetLatexAccent::Read(LyXLex & lex) +void InsetLatexAccent::read(Buffer const &, LyXLex & lex) { - lex.EatLine(); - contents = lex.GetString(); + lex.eatLine(); + contents = lex.getString(); checkContents(); } -int InsetLatexAccent::Latex(ostream & os, signed char /*fragile*/) -{ - os << contents; - return 0; -} - - -int InsetLatexAccent::Latex(string & file, signed char /*fragile*/) +int InsetLatexAccent::latex(Buffer const &, odocstream & os, + OutputParams const &) const { - file += contents; + os << from_ascii(contents); return 0; } -int InsetLatexAccent::Linuxdoc(string & file) +int InsetLatexAccent::plaintext(Buffer const &, odocstream & os, + OutputParams const &) const { - file += contents; + os << from_ascii(contents); return 0; } -int InsetLatexAccent::DocBook(string & file) +int InsetLatexAccent::docbook(Buffer const &, odocstream & os, + OutputParams const &) const { - file += contents; + // FIXME UNICODE + os << from_ascii(contents); return 0; } -bool InsetLatexAccent::Deletable() const +int InsetLatexAccent::textString(Buffer const & buf, odocstream & os, + OutputParams const & op) const { - return true; + return plaintext(buf, os, op); } -bool InsetLatexAccent::DirectWrite() const +bool InsetLatexAccent::directWrite() const { return true; } -Inset * InsetLatexAccent::Clone() const +InsetBase::Code InsetLatexAccent::lyxCode() const { - return new InsetLatexAccent(contents); -} - - -Inset::Code InsetLatexAccent::LyxCode() const -{ - return Inset::ACCENT_CODE; + return InsetBase::ACCENT_CODE; } @@ -646,3 +621,6 @@ ostream & operator<<(ostream & o, InsetLatexAccent::ACCENT_TYPES at) { return o << int(at); } + + +} // namespace lyx