* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include "insetlatexaccent.h"
#include "debug.h"
#include "lyxrc.h"
-#include "lyxdraw.h"
#include "support/lstrings.h"
+#include "BufferView.h"
#include "Painter.h"
+#include "font.h"
+#include "language.h"
-extern LyXRC * lyxrc;
+using std::ostream;
+using std::endl;
/* LatexAccent. Proper handling of accented characters */
/* This part is done by Ivan Schreter, schreter@ccsun.tuke.sk */
/* Later modified by Lars G. Bjønnes, larsbj@lyx.org */
InsetLatexAccent::InsetLatexAccent()
-{
- candisp = false;
-}
+ : candisp(false)
+{}
-InsetLatexAccent::InsetLatexAccent(string const & string)
- : contents(string)
+InsetLatexAccent::InsetLatexAccent(string const & str)
+ : contents(str)
{
checkContents();
}
{
candisp = false;
- if (contents.empty() || contents.length() < 2) return;
+ if (contents.empty() || contents.length() < 2) {
+ lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl;
+ return;
+ }
// REMOVE IN 0.13
// Dirty Hack for backward compability. remove in 0.13 (Lgb)
contents = tmp;
}
}
- if (contents[0] != '\\') return; // demand that first char is a '\\'
+ if (contents[0] != '\\') { // demand that first char is a '\\'
+ lyxerr[Debug::KEY] << "Cannot decode: " << contents << endl;
+ return;
+ }
lyxerr[Debug::KEY] << "Decode: " << contents << endl;
plusasc = true; // at the top (not really needed)
break;
default:
- printf ("Default\n");
+ lyxerr[Debug::KEY] << "Default" << endl;
// unknow accent (or something else)
return;
}
// special clause for \i{}, \j{} \l{} and \L{}
if ((modtype == DOT_LESS_I || modtype == DOT_LESS_J
|| modtype == lSLASH || modtype == LSLASH)
- && contents[3] == '}' ) {
+ && contents[3] == '}') {
switch (modtype) {
case DOT_LESS_I: ic = 'i'; break;
case DOT_LESS_J: ic = 'j'; break;
remdot = true;
else
return;
- } else if ( (ic == 'i'|| ic == 'j') && contents[4] == '}') {
+ } else if ((ic == 'i'|| ic == 'j') && contents[4] == '}') {
// Do a rewrite: \<foo>{i} --> \<foo>{\i}
string temp = contents;
temp.erase(3, string::npos);
temp += '\\';
temp += char(ic);
- for(string::size_type j = 4;
+ for (string::size_type j = 4;
j < contents.length(); ++j)
temp+= contents[j];
contents= temp;
}
-#ifdef USE_PAINTER
-int InsetLatexAccent::ascent(Painter &, LyXFont const & font) const
+int InsetLatexAccent::ascent(BufferView *, LyXFont const & font) const
{
// This function is a bit too simplistix and is just a
// "try to make a fit for all accents" approach, to
int max;
if (candisp) {
if (ic == ' ')
- max = font.ascent('a');
+ max = lyxfont::ascent('a', font);
else
- max = font.ascent(ic);
+ max = lyxfont::ascent(ic, font);
if (plusasc)
- max += (font.maxAscent() + 3) / 3;
+ max += (lyxfont::maxAscent(font) + 3) / 3;
} else
- max = font.maxAscent() + 4;
+ max = lyxfont::maxAscent(font) + 4;
return max;
}
-#else
-int InsetLatexAccent::Ascent(LyXFont const & font) const
-{
- // This function is a bit too simplistix 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.
- int max;
- if (candisp) {
- if (ic == ' ')
- max = font.ascent('a');
- else
- max = font.ascent(ic);
- if (plusasc)
- max += (font.maxAscent() + 3) / 3;
- } else
- max = font.maxAscent() + 4;
- return max;
-}
-#endif
-#ifdef USE_PAINTER
-int InsetLatexAccent::descent(Painter &, LyXFont const & font) const
+int InsetLatexAccent::descent(BufferView *, LyXFont const & font) const
{
int max;
if (candisp) {
if (ic == ' ')
- max = font.descent('a');
+ max = lyxfont::descent('a', font);
else
- max = font.descent(ic);
+ max = lyxfont::descent(ic, font);
if (plusdesc)
max += 3;
} else
- max = font.maxDescent() + 4;
+ max = lyxfont::maxDescent(font) + 4;
return max;
}
-#else
-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;
-}
-#endif
-#ifdef USE_PAINTER
-int InsetLatexAccent::width(Painter &, LyXFont const & font) const
+int InsetLatexAccent::width(BufferView *, LyXFont const & font) const
{
if (candisp)
- return font.textWidth(&ic, 1);
+ return lyxfont::width(ic, font);
else
- return font.stringWidth(contents) + 4;
+ return lyxfont::width(contents, font) + 4;
}
-#else
-int InsetLatexAccent::Width(LyXFont const & font) const
-{
- if (candisp)
- return font.textWidth(&ic, 1);
- else
- return font.stringWidth(contents) + 4;
-}
-#endif
-int InsetLatexAccent::Lbearing(LyXFont const & font) const
+int InsetLatexAccent::lbearing(LyXFont const & font) const
{
- return font.lbearing(ic);
+ return lyxfont::lbearing(ic, font);
}
-int InsetLatexAccent::Rbearing(LyXFont const & font) const
+int InsetLatexAccent::rbearing(LyXFont const & font) const
{
- return font.rbearing(ic);
+ return lyxfont::rbearing(ic, font);
}
-#ifdef USE_PAINTER
-bool InsetLatexAccent::DisplayISO8859_9(Painter & pain, LyXFont const & font,
+bool InsetLatexAccent::displayISO8859_9(BufferView * bv, LyXFont const & font,
int baseline,
float & x) const
{
}
if (tmpic != ic) {
char ch = char(tmpic);
- pain.text(x, baseline, ch, font);
- x += width(pain, font);
- return true;
- }
- else
- return false;
-}
-#else
-bool InsetLatexAccent::DisplayISO8859_9(LyXFont font,
- LyXScreen & scr,
- int baseline,
- float & x)
-{
- 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;
- break;
- }
- case BREVE:
- { if (ic == 'g') tmpic = 0xf0;
- if (ic == 'G') tmpic = 0xd0;
- break;
- }
- case UMLAUT:
- {
- if (ic == 'o') tmpic = 0xf6;
- if (ic == 'O') tmpic = 0xd6;
- if (ic == 'u') tmpic = 0xfc;
- if (ic == 'U') tmpic = 0xdc;
- 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);
+ bv->painter().text(int(x), baseline, ch, font);
+ x += width(bv, font);
return true;
}
else
return false;
}
-#endif
-#ifdef USE_PAINTER
-void InsetLatexAccent::draw(Painter & pain, LyXFont const & font,
- int baseline, float & x) const
+void InsetLatexAccent::draw(BufferView * bv, LyXFont const & font0,
+ int baseline, float & x, bool) const
{
- if (lyxrc->font_norm == "iso8859-9")
- if (DisplayISO8859_9(pain, font, baseline, x))
+ Painter & pain = bv->painter();
+
+ if (lyxrc.font_norm_type == LyXRC::ISO_8859_9)
+ if (displayISO8859_9(bv, font0, baseline, x))
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(font0);
+ if (lyxrc.font_norm_type == LyXRC::ISO_10646_1)
+ font.setLanguage(english_language);
if (candisp) {
- int asc = ascent(pain, font);
- int desc = descent(pain, font);
- int wid = width(pain, font);
- float x2 = x + (Rbearing(font) - Lbearing(font)) / 2.0;
+ int asc = ascent(bv, font);
+ int desc = descent(bv, font);
+ int wid = width(bv, font);
+ float x2 = x + (rbearing(font) - lbearing(font)) / 2.0;
float hg;
int y;
if (plusasc) {
// mark at the top
- hg = font.maxDescent();
+ hg = lyxfont::maxDescent(font);
y = baseline - asc;
if (font.shape() == LyXFont::ITALIC_SHAPE)
// first the letter
pain.text(int(x), baseline, ic, font);
-#if 0
- GC pgc = GetAccentGC(font, int((hg + 3.0) / 5.0));
-#endif
-
if (remdot) {
- int tmpvar = baseline - font.ascent('i');
+ int tmpvar = baseline - lyxfont::ascent('i', font);
float tmpx = 0;
if (font.shape() == LyXFont::ITALIC_SHAPE)
tmpx += (8.0 * hg) / 10.0; // italic
lyxerr[Debug::KEY] << "Removing dot." << endl;
// remove the dot first
pain.fillRectangle(int(x + tmpx), tmpvar, wid,
- font.ascent('i') -
- font.ascent('x') - 1,
- LColor::background);
+ lyxfont::ascent('i', font) -
+ lyxfont::ascent('x', font) - 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
- asc = ascent(pain, font); // the dot-less version (here: 'x')
+ asc = ascent(bv, font); // 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)
switch (modtype) {
- case ACUTE: // acute
+ case ACUTE: // acute 0xB4
{
- pain.line(int(x2), int(y + hg),
- int(x2 + hg35), y + hg35);
+ pain.text(int(x2 - (lyxfont::rbearing(0xB4, font) - lyxfont::lbearing(0xB4, font)) / 2),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0xB4, font) - (lyxfont::ascent(0xB4, font) + lyxfont::descent(0xB4, font)) / 2,
+ char(0xB4), font);
break;
}
- case GRAVE: // grave
+ case GRAVE: // grave 0x60
{
- pain.line(int(x2), int(y + hg),
- int(x2 - hg35), y + hg35);
+ pain.text(int(x2 - (lyxfont::rbearing(0x60, font) - lyxfont::lbearing(0x60, font)) / 2),
+ int(baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0x60, font) - (lyxfont::ascent(0x60, font) + lyxfont::descent(0x60, font)) / 2.0),
+ char(0x60), font);
break;
}
case MACRON: // macron
{
- pain.line(int(x2 - wid * 0.4),
- int(y + hg),
- int(x2 + wid * 0.4),
- int(y + hg));
+ pain.text(int(x2 - (lyxfont::rbearing(0xAF, font) - lyxfont::lbearing(0xAF, font)) / 2),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0xAF, font) - (lyxfont::ascent(0xAF, font) + lyxfont::descent(0xAF, font)),
+ char(0xAF), font);
break;
}
case TILDE: // tilde
{
- if (hg35 > 2.0) hg35 -= 1.0;
- x2 += (hg35 / 2.0);
- int xp[4], yp[4];
-
- xp[0] = int(x2 - 2.0 * hg35);
- yp[0] = int(y + hg);
-
- xp[1] = int(x2 - hg35);
- yp[1] = int(y + hg35);
-
- xp[2] = int(x2);
- yp[2] = int(y + hg);
-
- xp[3] = int(x2 + hg35);
- yp[3] = int(y + hg35);
-
- pain.lines(xp, yp, 4);
+ pain.text(int(x2 - (lyxfont::rbearing('~', font) - lyxfont::lbearing('~', font)) / 2),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent('~', font) - (lyxfont::ascent('~', font) + lyxfont::descent('~', font)) / 2,
+ '~', font);
break;
}
- case UNDERBAR: // underbar
+ case UNDERBAR: // underbar 0x5F
{
- pain.line(int(x2 - wid * 0.4),
- y + hg / 2.0,
- int(x2 + wid * 0.4),
- y + hg / 2.0);
+ pain.text(int(x2 - (lyxfont::rbearing(0x5F, font) - lyxfont::lbearing(0x5F, font)) / 2), baseline,
+ char(0x5F), font);
break;
}
case CEDILLA: // cedilla
{
- int xp[4], yp[4];
+ pain.text(int(x2 - (lyxfont::rbearing(0xB8, font) - lyxfont::lbearing(0xB8, font)) / 2), baseline,
+ char(0xB8), font);
- xp[0] = int(x2);
- yp[0] = y;
-
- xp[1] = int(x2);
- yp[1] = y + int(hg / 3.0);
-
- xp[2] = int(x2 + (hg / 3.0));
- yp[2] = y + int(hg / 2.0);
-
- xp[3] = int(x2 - (hg / 4.0));
- yp[3] = y + int(hg);
-
- pain.lines(xp, yp, 4);
break;
}
case UNDERDOT: // underdot
{
- pain.arc(int(x2), y + hg35,
- 3, 3, 0, 360 * 64);
+ pain.text(int(x2 - (lyxfont::rbearing('.', font) - lyxfont::lbearing('.', font)) / 2.0),
+ int(baseline + 3.0 / 2.0 * (lyxfont::ascent('.', font) + lyxfont::descent('.', font))),
+ '.', font);
break;
}
case DOT: // dot
{
- pain.arc(int(x2), y + hg * 0.5,
- (hg + 3.0)/5.0,
- (hg + 3.0)/5.0,
- 0, 360 * 64);
+ pain.text(int(x2 - (lyxfont::rbearing('.', font) - lyxfont::lbearing('.', font)) / 2.0),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent('.', font) - (lyxfont::ascent('.', font) + lyxfont::descent('.', font)) / 2,
+ '.', font);
break;
}
case CIRCLE: // circle
{
- pain.arc(int(x2 - (hg / 2.0)),
- y + (hg / 2.0), hg, hg , 0,
- 360 * 64);
+ LyXFont tmpf(font);
+ tmpf.decSize().decSize();
+ pain.text(int(x2 - (lyxfont::rbearing(0xB0, tmpf) - lyxfont::lbearing(0xB0, tmpf)) / 2.0),
+ int(baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0xB0, tmpf) - (lyxfont::ascent(0xB0, tmpf) + lyxfont::descent(0xB0, tmpf)) / 3.0),
+ char(0xB0), tmpf);
break;
}
case TIE: // tie
{
- pain.arc(int(x2 + hg35), y + hg / 2.0,
- 2 * hg, hg, 0, 360 * 32);
+ pain.arc(int(x2 + hg35), int(y + hg / 2.0),
+ int(2 * hg), int(hg), 0, 360 * 32);
break;
}
case BREVE: // breve
{
pain.arc(int(x2 - (hg / 2.0)), y,
- hg, hg, 0, -360*32);
+ int(hg), int(hg), 0, -360*32);
break;
}
case CARON: // caron
}
case HUNGARIAN_UMLAUT: // hung. umlaut
{
- int xs1[2], xs2[2], ys1[2], ys2[2];
-
- xs1[0] = int(x2 - (hg / 2.0));
- ys1[0] = int(y + hg);
-
- xs2[0] = int(x2 + hg35 - (hg / 2.0));
- ys2[0] = int(y + hg35);
-
- xs1[1] = int(x2 + (hg / 2.0));
- ys1[1] = int(y + hg);
-
- xs2[1] = int(x2 + hg35 + (hg / 2.0));
- ys2[1] = int(y + hg35);
-
- pain.segments(xs1, ys1, xs2, ys2, 2);
+ pain.text(int(x2 - (lyxfont::rbearing('´', font) - lyxfont::lbearing('´', font))),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent('´', font) - (lyxfont::ascent('´', font) + lyxfont::descent('´', font)) / 2,
+ '´', font);
+ pain.text(int(x2),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent('´', font) - (lyxfont::ascent('´', font) + lyxfont::descent('´', font)) / 2,
+ '´', font);
break;
}
case UMLAUT: // umlaut
{
- float rad = hg / 2.0;
- if (rad <= 1.0) {
- pain.point(int(x2 - 4.0 * hg / 7.0),
- y + hg35);
- pain.point(int(x2 + 4.0 * hg / 7.0),
- y + hg35);
- } else {
- rad += .5; // this ensures that f.ex. 1.5 will
- // not be rounded down to .5 and then
- // converted to int = 0
- pain.arc(int(x2 - 2.0 * hg / 4.0),
- y + hg35,
- rad, rad,
- 0, 360 * 64);
- pain.arc(int(x2 + 2.0 * hg / 4.0),
- y + hg35,
- rad, rad, 0, 360*64);
- }
+ pain.text(int(x2 - (lyxfont::rbearing('¨', font) - lyxfont::lbearing('¨', font)) / 2),
+ baseline - lyxfont::ascent(ic, font) - lyxfont::descent('¨', font) - (lyxfont::ascent('¨', font) + lyxfont::descent('¨', font)) / 2,
+ '¨', font);
break;
}
case CIRCUMFLEX: // circumflex
{
- int xp[3], yp[3];
-
- xp[0] = int(x2 - hg35); yp[0] = y + int(hg);
- xp[1] = int(x2); yp[1] = int(y + hg35);
- xp[2] = int(x2 + hg35); yp[2] = y + int(hg);
- pain.lines(xp, yp, 3);
+ LyXFont tmpf(font);
+ tmpf.decSize().decSize().decSize();
+ pain.text(int(x2 - (lyxfont::rbearing(0x5E, tmpf) - lyxfont::lbearing(0x5E, tmpf)) / 2),
+ int(baseline - lyxfont::ascent(ic, font) - lyxfont::descent(0x5E, tmpf) - (lyxfont::ascent(0x5E, tmpf) + lyxfont::descent(0x5E, tmpf)) / 3.0),
+ char(0x5E), tmpf);
break;
}
case OGONEK: // ogonek
}
} else {
pain.fillRectangle(int(x + 1),
- baseline - ascent(pain, font) + 1,
- width(pain, font) - 2,
- ascent(pain, font)
- + descent(pain, font) - 2);
- pain.rectangle(int(x + 1), baseline - ascent(pain, font) + 1,
- width(pain, font) - 2,
- ascent(pain, font) + descent(pain, font) - 2);
+ baseline - ascent(bv, font) + 1,
+ width(bv, font) - 2,
+ ascent(bv, font)
+ + descent(bv, font) - 2,
+ backgroundColor());
+ pain.rectangle(int(x + 1), baseline - ascent(bv, font) + 1,
+ width(bv, font) - 2,
+ ascent(bv, font) + descent(bv, font) - 2);
pain.text(int(x + 2), baseline, contents, font);
}
- x += width(pain, font);
+ x += width(bv, font);
}
-#else
-void InsetLatexAccent::Draw(LyXFont font,
- LyXScreen & scr,
- int baseline,
- float & x)
-{
- if (lyxrc->font_norm == "iso8859-9")
- if (DisplayISO8859_9 (font, scr, baseline, x))
- 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.
-
- if (candisp) {
- int asc = Ascent(font);
- int desc = Descent(font);
- int wid = Width(font);
- float x2 = x + (Rbearing(font) - Lbearing(font)) / 2.0;
- float hg;
- int y;
- if (plusasc) {
- // mark at the top
- hg = font.maxDescent();
- y = baseline - asc;
- if (font.shape() == LyXFont::ITALIC_SHAPE)
- x2 += (4.0 * hg) / 5.0; // italic
- } else {
- // at the bottom
- hg = desc;
- y = baseline;
- }
-
- float hg35 = float(hg * 3.0) / 5.0;
-
- // display with proper accent mark
- // first the letter
- scr.drawText(font, &ic, 1, baseline, int(x));
-
- GC pgc = GetAccentGC(font, int((hg + 3.0) / 5.0));
- if (remdot) {
- int tmpvar = baseline - font.ascent('i');
- float tmpx = 0;
- if (font.shape() == LyXFont::ITALIC_SHAPE)
- tmpx += (8.0 * hg) / 10.0; // 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);
- // 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
- asc = Ascent(font); // 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)
- switch (modtype) {
- case ACUTE: // acute
- {
- scr.drawLine(pgc, int(x2), int(y + hg),
- int(x2 + hg35), y + hg35);
- break;
- }
- case GRAVE: // grave
- {
- scr.drawLine(pgc, int(x2), int(y + hg),
- int(x2 - hg35), y + hg35);
- break;
- }
- case MACRON: // macron
- {
- scr.drawLine(pgc,
- int(x2 - wid * 0.4),
- int(y + hg),
- int(x2 + wid * 0.4),
- int(y + hg));
- break;
- }
- case TILDE: // tilde
- {
- if (hg35 > 2.0) hg35 -= 1.0;
- x2 += (hg35 / 2.0);
- XPoint p[4];
- p[0].x = int(x2 - 2.0 * 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);
- break;
- }
- case UNDERBAR: // underbar
- {
- scr.drawLine(pgc,
- int(x2 - wid * 0.4),
- y + (hg / 2.0),
- int(x2 + wid * 0.4),
- y + (hg / 2.0));
- 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 + int(hg / 3.0);
- p[2].x = int(x2 + (hg / 3.0));
- p[2].y = y + int(hg / 2.0);
- p[3].x = int(x2 - (hg / 4.0)); p[3].y = y + int(hg);
- scr.drawLines(pgc, p, 4);
- break;
- }
- case UNDERDOT: // underdot
- {
- scr.fillArc(pgc, int(x2), y + hg35,
- 3, 3, 0, 360*64);
- break;
- }
-
- case DOT: // dot
- {
- scr.fillArc(pgc, int(x2), y + hg * 0.5,
- (hg + 3.0)/5.0,
- (hg + 3.0)/5.0, 0, 360*64);
- break;
- }
-
- case CIRCLE: // circle
- {
- scr.drawArc(pgc, int(x2 - (hg / 2.0)),
- y + (hg / 2.0), hg, hg, 0,
- 360*64);
- break;
- }
- case TIE: // tie
- {
- scr.drawArc(pgc,
- int(x2 + hg35), y + (hg / 2.0),
- 2 * hg, hg, 0, 360*32);
- break;
- }
- case BREVE: // breve
- {
- scr.drawArc(pgc,
- int(x2 - (hg / 2.0)), y,
- hg, hg, 0, -360*32);
- break;
- }
- case CARON: // caron
- {
- XPoint p[3];
- p[0].x = int(x2 - hg35); p[0].y = int(y + hg35);
- p[1].x = int(x2); p[1].y = int(y + hg);
- p[2].x = int(x2 + hg35); p[2].y = int(y + hg35);
- scr.drawLines(pgc, p, 3);
- break;
- }
- case SPECIAL_CARON: // special caron
- {
- switch (ic) {
- case 'L': wid = int(4.0 * 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.0));
- p[1].y = int(y + hg + (hg35 / 2.0));
- p[2].x = int(x + wid + (hg35 / 2.0));
- p[2].y = y + int(hg);
- scr.drawLines(pgc, p, 3);
- break;
- }
- case HUNGARIAN_UMLAUT: // hung. umlaut
- {
- XSegment s[2];
- s[0].x1= int(x2 - (hg / 2.0)); s[0].y1 = int(y + hg);
- s[0].x2 = int(x2 + hg35 - (hg / 2.0));
- s[0].y2 = int(y + hg35);
- s[1].x1 = int(x2 + (hg / 2.0));
- s[1].y1 = int(y + hg);
- s[1].x2 = int(x2 + hg35 + (hg / 2.0));
- s[1].y2 = int(y + hg35);
-
- scr.drawSegments(pgc, s, 2);
- break;
- }
- case UMLAUT: // umlaut
- {
- float rad = hg / 2.0;
- if (rad <= 1.0) {
- scr.drawPoint(pgc,
- int(x2 - ((4.0 * hg) / 7.0)),
- y + hg35);
- scr.drawPoint(pgc,
- int(x2 + ((4.0 * hg) / 7.0)),
- y + hg35);
- } else {
- rad += .5; // this ensures that f.ex. 1.5 will
- // not be rounded down to .5 and then
- // converted to int = 0
- scr.fillArc(pgc, int(x2 - ((2.0 * hg) / 4.0)),
- y + hg35,
- rad, rad, 0, 360*64);
- scr.fillArc(pgc, int(x2 + ((2.0 * hg) / 4.0)),
- y + hg35,
- rad, rad, 0, 360*64);
- }
- //scr.drawText(font, "¨", 1, y + hg, x2);
- break;
- }
- case CIRCUMFLEX: // circumflex
- {
- XPoint p[3];
- p[0].x = int(x2 - hg35); p[0].y = y + int(hg);
- p[1].x = int(x2); p[1].y = int(y + hg35);
- p[2].x = int(x2 + hg35); p[2].y = y + int(hg);
- scr.drawLines(pgc, p, 3);
- break;
- }
- case OGONEK: // 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 + int(hg35);
- p[2].x = int(x2 - hg35);
- p[2].y = y + int(hg / 2.0);
- p[3].x = int(x2 + (hg / 4.0)); p[3].y = y + int(hg);
- scr.drawLines(pgc, p, 4);
- break;
- }
- case lSLASH:
- case LSLASH:
- {
- XPoint p[2];
- p[0].x = int(x);
- p[0].y = y + int(3.0 * hg);
- p[1].x = int(x + float(wid) * 0.75);
- p[1].y = y + int(hg);
- scr.drawLines(pgc, p, 2);
- 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));
- }
- x += Width(font);
-}
-#endif
-
-
-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*/)
+int InsetLatexAccent::latex(Buffer const *, ostream & os,
+ bool /*fragile*/, bool/*fs*/) const
{
os << contents;
return 0;
}
-int InsetLatexAccent::Latex(string & file, signed char /*fragile*/)
+int InsetLatexAccent::ascii(Buffer const *, ostream & os, int) const
{
- file += contents;
+ os << contents;
return 0;
}
-int InsetLatexAccent::Linuxdoc(string & file)
+int InsetLatexAccent::linuxdoc(Buffer const *, ostream & os) const
{
- file += contents;
+ os << contents;
return 0;
}
-int InsetLatexAccent::DocBook(string & file)
+int InsetLatexAccent::docbook(Buffer const *, ostream & os) const
{
- file += contents;
+ os << contents;
return 0;
}
-bool InsetLatexAccent::Deletable() const
+bool InsetLatexAccent::deletable() const
{
return true;
}
-bool InsetLatexAccent::DirectWrite() const
+bool InsetLatexAccent::directWrite() const
{
return true;
}
-Inset * InsetLatexAccent::Clone() const
+Inset * InsetLatexAccent::clone(Buffer const &, bool) const
{
return new InsetLatexAccent(contents);
}
-Inset::Code InsetLatexAccent::LyxCode() const
+Inset::Code InsetLatexAccent::lyxCode() const
{
return Inset::ACCENT_CODE;
}
projects / lyx.git / blobdiff