This is simply to make later patches more readable, and should be
applied to the trunk. No logic changes are included.
thanks
john
--
"This is playing, not work, therefore it's not a waste of time."
- Zath
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.718
diff -u -r1.718 ChangeLog
--- src/ChangeLog 22 May 2002 12:33:01 -0000 1.718
+++ src/ChangeLog 23 May 2002 05:29:14 -0000
@@ -1,3 +1,15 @@
+2002-05-23 John Levon <[EMAIL PROTECTED]>
+
+ * src/Makefile.am:
+ * src/Painter.C:
+ * src/Painter.h:
+ * src/WorkArea.C:
+ * src/WorkArea.h:
+ * src/screen.C:
+ * src/tabular.C:
+ * src/text.C:
+ * src/text2.C: move Painter to frontends/
+
2002-05-22 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* buffer.C: comment out some some code that depend upon lyx_format
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.119
diff -u -r1.119 Makefile.am
--- src/Makefile.am 25 Mar 2002 22:07:48 -0000 1.119
+++ src/Makefile.am 23 May 2002 05:29:18 -0000
@@ -30,7 +30,9 @@
Variables.C \
Variables.h \
counters.C \
- counters.h
+ counters.h \
+ tracer.C \
+ tracer.h
INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
@@ -78,8 +80,6 @@
LyXView.h \
MenuBackend.C \
MenuBackend.h \
- Painter.C \
- Painter.h \
PainterBase.C \
PainterBase.h \
ParagraphParameters.C \
@@ -211,8 +211,6 @@
texrow.h \
text.C \
text2.C \
- tracer.C \
- tracer.h \
trans.C \
trans.h \
trans_decl.h \
Index: src/Painter.C
===================================================================
RCS file: src/Painter.C
diff -N src/Painter.C
--- src/Painter.C 22 May 2002 01:16:35 -0000 1.35
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,303 +0,0 @@
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1998-2001 The LyX Team
- *
- *======================================================*/
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "Painter.h"
-#include "LString.h"
-#include "debug.h"
-#include "lyxfont.h"
-#include "WorkArea.h"
-#include "font.h"
-#include "ColorHandler.h"
-#include "lyxrc.h"
-#include "encoding.h"
-#include "language.h"
-
-#include "frontends/GUIRunTime.h"
-#include "graphics/GraphicsImage.h"
-
-#include "support/LAssert.h"
-#include "support/lstrings.h"
-
-#include <boost/scoped_array.hpp>
-
-#include <cmath>
-
-
-using std::endl;
-using std::max;
-
-namespace {
-
-inline
-Display * display()
-{
- return GUIRunTime::x11Display();
-}
-
-}
-
-
-Painter::Painter(WorkArea & wa)
- : PainterBase(wa)
-{}
-
-
-// Basic drawing routines
-
-PainterBase & Painter::point(int x, int y, LColor::color c)
-{
- XDrawPoint(display(), owner.getPixmap(),
- lyxColorHandler->getGCForeground(c), x, y);
- return *this;
-}
-
-
-PainterBase & Painter::line(int x1, int y1, int x2, int y2,
- LColor::color col,
- enum line_style ls,
- enum line_width lw)
-{
- XDrawLine(display(), owner.getPixmap(),
- lyxColorHandler->getGCLinepars(ls, lw, col),
- x1, y1, x2, y2);
- return *this;
-}
-
-
-PainterBase & Painter::lines(int const * xp, int const * yp, int np,
- LColor::color col,
- enum line_style ls,
- enum line_width lw)
-{
- boost::scoped_array<XPoint> points(new XPoint[np]);
-
- for (int i = 0; i < np; ++i) {
- points[i].x = xp[i];
- points[i].y = yp[i];
- }
-
- XDrawLines(display(), owner.getPixmap(),
- lyxColorHandler->getGCLinepars(ls, lw, col),
- points.get(), np, CoordModeOrigin);
-
- return *this;
-}
-
-
-PainterBase & Painter::rectangle(int x, int y, int w, int h,
- LColor::color col,
- enum line_style ls,
- enum line_width lw)
-{
- XDrawRectangle(display(), owner.getPixmap(),
- lyxColorHandler->getGCLinepars(ls, lw, col),
- x, y, w, h);
- return *this;
-}
-
-
-PainterBase & Painter::fillRectangle(int x, int y, int w, int h,
- LColor::color col)
-{
- XFillRectangle(display(), owner.getPixmap(),
- lyxColorHandler->getGCForeground(col), x, y, w, h);
- return *this;
-}
-
-
-PainterBase & Painter::fillPolygon(int const * xp, int const * yp, int np,
- LColor::color col)
-{
- boost::scoped_array<XPoint> points(new XPoint[np]);
-
- for (int i = 0; i < np; ++i) {
- points[i].x = xp[i];
- points[i].y = yp[i];
- }
-
- XFillPolygon(display(), owner.getPixmap(),
- lyxColorHandler->getGCForeground(col), points.get(), np,
- Nonconvex, CoordModeOrigin);
-
- return *this;
-}
-
-
-PainterBase & Painter::arc(int x, int y,
- unsigned int w, unsigned int h,
- int a1, int a2, LColor::color col)
-{
- XDrawArc(display(), owner.getPixmap(),
- lyxColorHandler->getGCForeground(col),
- x, y, w, h, a1, a2);
- return *this;
-}
-
-
-/// Draw lines from x1,y1 to x2,y2. They are arrays
-PainterBase & Painter::segments(int const * x1, int const * y1,
- int const * x2, int const * y2, int ns,
- LColor::color col,
- enum line_style ls, enum line_width lw)
-{
- boost::scoped_array<XSegment> s(new XSegment[ns]);
-
- for (int i = 0; i < ns; ++i) {
- s[i].x1 = x1[i];
- s[i].y1 = y1[i];
- s[i].x2 = x2[i];
- s[i].y2 = y2[i];
- }
- XDrawSegments(display(), owner.getPixmap(),
- lyxColorHandler->getGCLinepars(ls, lw, col),
- s.get(), ns);
-
- return *this;
-}
-
-
-PainterBase & Painter::image(int x, int y, int w, int h,
- grfx::GImage const & image)
-{
- XGCValues val;
- val.function = GXcopy;
- GC gc = XCreateGC(display(), owner.getPixmap(),
- GCFunction, &val);
- XCopyArea(display(), image.getPixmap(), owner.getPixmap(), gc,
- 0, 0, w, h, x, y);
- XFreeGC(display(), gc);
- return *this;
-}
-
-
-PainterBase & Painter::text(int x, int y, string const & s, LyXFont const & f)
-{
- return text(x, y, s.data(), s.length(), f);
-}
-
-
-PainterBase & Painter::text(int x, int y, char c, LyXFont const & f)
-{
- char s[2] = { c, '\0' };
- return text(x, y, s, 1, f);
-}
-
-
-PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
- LyXFont const & f)
-{
- if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
- boost::scoped_array<XChar2b> xs(new XChar2b[ls]);
- Encoding const * encoding = f.language()->encoding();
- LyXFont font(f);
- if (f.isSymbolFont()) {
-#ifdef USE_UNICODE_FOR_SYMBOLS
- font.setFamily(LyXFont::ROMAN_FAMILY);
- font.setShape(LyXFont::UP_SHAPE);
-#endif
- encoding = encodings.symbol_encoding();
- }
- for (size_t i = 0; i < ls; ++i) {
- Uchar c = encoding->ucs(s[i]);
- xs[i].byte1 = c >> 8;
- xs[i].byte2 = c & 0xff;
- }
- text(x , y, xs.get(), ls, font);
- return *this;
- }
-
- GC gc = lyxColorHandler->getGCForeground(f.realColor());
- if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
- lyxfont::XSetFont(display(), gc, f);
- XDrawString(display(), owner.getPixmap(), gc, x, y, s, ls);
- } else {
- LyXFont smallfont(f);
- smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
- int tmpx = x;
- for (size_t i = 0; i < ls; ++i) {
- char const c = uppercase(s[i]);
- if (c != s[i]) {
- lyxfont::XSetFont(display(), gc, smallfont);
- XDrawString(display(), owner.getPixmap(), gc,
- tmpx, y, &c, 1);
- tmpx += lyxfont::XTextWidth(smallfont, &c, 1);
- } else {
- lyxfont::XSetFont(display(), gc, f);
- XDrawString(display(), owner.getPixmap(), gc,
- tmpx, y, &c, 1);
- tmpx += lyxfont::XTextWidth(f, &c, 1);
- }
- }
- }
-
- if (f.underbar() == LyXFont::ON) {
- underline(f, x, y, lyxfont::width(s, ls, f));
- }
-
- return *this;
-}
-
-
-PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
- LyXFont const & f)
-{
- GC gc = lyxColorHandler->getGCForeground(f.realColor());
- if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
- lyxfont::XSetFont(display(), gc, f);
- XDrawString16(display(), owner.getPixmap(), gc, x, y, s, ls);
- } else {
- LyXFont smallfont(f);
- smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
- static XChar2b c;
- int tmpx = x;
- for (int i = 0; i < ls; ++i) {
- if (s[i].byte1)
- c = s[i];
- else {
- c.byte1 = s[i].byte1;
- c.byte2 = uppercase(s[i].byte2);
- }
- if (c.byte2 != s[i].byte2) {
- lyxfont::XSetFont(display(), gc, smallfont);
- XDrawString16(display(), owner.getPixmap(), gc,
- tmpx, y, &c, 1);
- tmpx += lyxfont::XTextWidth16(smallfont, &c, 1);
- } else {
- lyxfont::XSetFont(display(), gc, f);
- XDrawString16(display(), owner.getPixmap(), gc,
- tmpx, y, &c, 1);
- tmpx += lyxfont::XTextWidth16(f, &c, 1);
- }
- }
- }
-
- if (f.underbar() == LyXFont::ON) {
- underline(f, x, y, lyxfont::width(s, ls, f));
- }
-
- return *this;
-}
-
-
-void Painter::underline(LyXFont const & f, int x, int y, int width)
-{
- int const below = max(lyxfont::maxDescent(f) / 2, 2);
- int const height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
- if (height < 2)
- line(x, y + below, x + width, y + below, f.color());
- else
- fillRectangle(x, y + below, width, below + height,
- f.color());
-}
Index: src/Painter.h
===================================================================
RCS file: src/Painter.h
diff -N src/Painter.h
--- src/Painter.h 21 Mar 2002 17:25:09 -0000 1.23
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 1995-2001 The LyX Team
- *
- * ======================================================*/
-
-#ifndef PAINTER_H
-#define PAINTER_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
-
-// This is only included to provide stuff for the non-public sections
-#include <X11/Xlib.h>
-
-#include "PainterBase.h"
-
-class LyXFont;
-class WorkArea;
-
-/** An inplementation for the X Window System. Xlib.
- Classes similar to this one can be made for gtk+, Qt, etc.
-*/
-class Painter : public PainterBase {
-public:
- /// Constructor
- explicit Painter(WorkArea &);
-
- /// Draw a line from point to point
- PainterBase & line(int x1, int y1, int x2, int y2,
- LColor::color = LColor::foreground,
- enum line_style = line_solid,
- enum line_width = line_thin);
-
- /// Here xp and yp are arrays of points
- PainterBase & lines(int const * xp, int const * yp, int np,
- LColor::color = LColor::foreground,
- enum line_style = line_solid,
- enum line_width = line_thin);
-
- /// Here xp and yp are arrays of points
- PainterBase & fillPolygon(int const * xp, int const * yp, int np,
- LColor::color = LColor::foreground);
-
- /// Draw lines from x1,y1 to x2,y2. They are arrays
- PainterBase & segments(int const * x1, int const * y1,
- int const * x2, int const * y2, int ns,
- LColor::color = LColor::foreground,
- enum line_style = line_solid,
- enum line_width = line_thin);
-
- /// Draw a rectangle
- PainterBase & rectangle(int x, int y, int w, int h,
- LColor::color = LColor::foreground,
- enum line_style = line_solid,
- enum line_width = line_thin);
-
- /// Draw an arc
- PainterBase & arc(int x, int y, unsigned int w, unsigned int h,
- int a1, int a2,
- LColor::color = LColor::foreground);
-
- /// Draw a pixel
- PainterBase & point(int x, int y, LColor::color = LColor::foreground);
-
- /// Fill a rectangle
- PainterBase & fillRectangle(int x, int y, int w, int h,
- LColor::color);
-
- /// For the graphics inset.
- PainterBase & image(int x, int y, int w, int h,
- grfx::GImage const & image);
-
- /// Draw a string at position x, y (y is the baseline)
- PainterBase & text(int x, int y,
- string const & str, LyXFont const & f);
-
- /** Draw a string at position x, y (y is the baseline)
- This is just for fast drawing */
- PainterBase & text(int x, int y, char const * str, size_t l,
- LyXFont const & f);
-
- /// Draw a char at position x, y (y is the baseline)
- PainterBase & text(int x, int y, char c, LyXFont const & f);
-
- /// Draw a wide string at position x, y
- PainterBase & text(int x, int y, XChar2b const * str, int l,
- LyXFont const & f);
-private:
- /// Check the font, and if set, draw an underline
- void underline(LyXFont const & f, int x, int y, int width);
-};
-
-#endif
Index: src/WorkArea.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/WorkArea.h,v
retrieving revision 1.32
diff -u -r1.32 WorkArea.h
--- src/WorkArea.h 21 Mar 2002 17:25:09 -0000 1.32
+++ src/WorkArea.h 23 May 2002 05:29:19 -0000
@@ -21,7 +21,7 @@
#include <sigc++/signal_system.h>
#include FORMS_H_LOCATION
-#include "Painter.h"
+#include "frontends/Painter.h"
///
class WorkArea {
Index: src/screen.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/screen.C,v
retrieving revision 1.64
diff -u -r1.64 screen.C
--- src/screen.C 3 May 2002 09:22:06 -0000 1.64
+++ src/screen.C 23 May 2002 05:29:44 -0000
@@ -19,7 +19,7 @@
#include "lyxscreen.h"
#include "lyxtext.h"
#include "lyxrow.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "WorkArea.h"
#include "buffer.h"
#include "BufferView.h"
Index: src/tabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tabular.C,v
retrieving revision 1.130
diff -u -r1.130 tabular.C
--- src/tabular.C 3 May 2002 11:56:48 -0000 1.130
+++ src/tabular.C 23 May 2002 05:29:49 -0000
@@ -25,7 +25,7 @@
#include "layout.h"
#include "buffer.h"
#include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "LaTeXFeatures.h"
#include "insets/insettabular.h"
#include "insets/insettext.h"
Index: src/text.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text.C,v
retrieving revision 1.248
diff -u -r1.248 text.C
--- src/text.C 14 May 2002 09:40:54 -0000 1.248
+++ src/text.C 23 May 2002 05:30:00 -0000
@@ -20,7 +20,7 @@
#include "debug.h"
#include "lyxrc.h"
#include "LyXView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "tracer.h"
#include "font.h"
#include "encoding.h"
Index: src/text2.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/text2.C,v
retrieving revision 1.228
diff -u -r1.228 text2.C
--- src/text2.C 2 May 2002 12:45:27 -0000 1.228
+++ src/text2.C 23 May 2002 05:30:05 -0000
@@ -26,7 +26,7 @@
#include "BufferView.h"
#include "LyXView.h"
#include "CutAndPaste.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "debug.h"
#include "lyxrc.h"
@@ -739,11 +739,10 @@
freezeUndo();
cursor = selection.start;
while (cursor.par() != selection.end.par() ||
- (cursor.pos() < selection.end.pos()))
+ cursor.pos() < selection.end.pos())
{
if (cursor.pos() < cursor.par()->size()) {
- // an open footnote should behave
- // like a closed one
+ // an open footnote should behave like a closed one
setCharFont(bview, cursor.par(), cursor.pos(),
font, toggleall);
cursor.pos(cursor.pos() + 1);
@@ -2662,9 +2661,6 @@
void LyXText::status(BufferView * bview, LyXText::text_status st) const
{
- // well as much as I know && binds more then || so the above and the
- // below are identical (this for your known use of parentesis!)
- // Now some explanation:
// We should only go up with refreshing code so this means that if
// we have a MORE refresh we should never set it to LITTLE if we still
// didn't handle it (and then it will be UNCHANGED. Now as long as
Index: src/frontends/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/ChangeLog,v
retrieving revision 1.59
diff -u -r1.59 ChangeLog
--- src/frontends/ChangeLog 22 May 2002 01:16:35 -0000 1.59
+++ src/frontends/ChangeLog 23 May 2002 05:30:08 -0000
@@ -1,3 +1,9 @@
+2002-05-23 John Levon <[EMAIL PROTECTED]>
+
+ * Makefile.am:
+ * Painter.h:
+ * Painter.C: move Painter here
+
2002-05-22 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* Dialogs.h: use more specific smart_ptr header
Index: src/frontends/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- src/frontends/Makefile.am 8 Apr 2002 09:42:56 -0000 1.33
+++ src/frontends/Makefile.am 23 May 2002 05:30:08 -0000
@@ -26,6 +26,8 @@
Liason.h \
Menubar.C \
Menubar.h \
+ Painter.C \
+ Painter.h \
Timeout.C \
Timeout.h \
Toolbar.C \
Index: src/frontends/Painter.C
===================================================================
RCS file: src/frontends/Painter.C
diff -N src/frontends/Painter.C
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/Painter.C 23 May 2002 05:30:08 -0000
@@ -0,0 +1,303 @@
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1998-2001 The LyX Team
+ *
+ *======================================================*/
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "frontends/Painter.h"
+#include "LString.h"
+#include "debug.h"
+#include "lyxfont.h"
+#include "WorkArea.h"
+#include "font.h"
+#include "ColorHandler.h"
+#include "lyxrc.h"
+#include "encoding.h"
+#include "language.h"
+
+#include "frontends/GUIRunTime.h"
+#include "graphics/GraphicsImage.h"
+
+#include "support/LAssert.h"
+#include "support/lstrings.h"
+
+#include <boost/scoped_array.hpp>
+
+#include <cmath>
+
+
+using std::endl;
+using std::max;
+
+namespace {
+
+inline
+Display * display()
+{
+ return GUIRunTime::x11Display();
+}
+
+}
+
+
+Painter::Painter(WorkArea & wa)
+ : PainterBase(wa)
+{}
+
+
+// Basic drawing routines
+
+PainterBase & Painter::point(int x, int y, LColor::color c)
+{
+ XDrawPoint(display(), owner.getPixmap(),
+ lyxColorHandler->getGCForeground(c), x, y);
+ return *this;
+}
+
+
+PainterBase & Painter::line(int x1, int y1, int x2, int y2,
+ LColor::color col,
+ enum line_style ls,
+ enum line_width lw)
+{
+ XDrawLine(display(), owner.getPixmap(),
+ lyxColorHandler->getGCLinepars(ls, lw, col),
+ x1, y1, x2, y2);
+ return *this;
+}
+
+
+PainterBase & Painter::lines(int const * xp, int const * yp, int np,
+ LColor::color col,
+ enum line_style ls,
+ enum line_width lw)
+{
+ boost::scoped_array<XPoint> points(new XPoint[np]);
+
+ for (int i = 0; i < np; ++i) {
+ points[i].x = xp[i];
+ points[i].y = yp[i];
+ }
+
+ XDrawLines(display(), owner.getPixmap(),
+ lyxColorHandler->getGCLinepars(ls, lw, col),
+ points.get(), np, CoordModeOrigin);
+
+ return *this;
+}
+
+
+PainterBase & Painter::rectangle(int x, int y, int w, int h,
+ LColor::color col,
+ enum line_style ls,
+ enum line_width lw)
+{
+ XDrawRectangle(display(), owner.getPixmap(),
+ lyxColorHandler->getGCLinepars(ls, lw, col),
+ x, y, w, h);
+ return *this;
+}
+
+
+PainterBase & Painter::fillRectangle(int x, int y, int w, int h,
+ LColor::color col)
+{
+ XFillRectangle(display(), owner.getPixmap(),
+ lyxColorHandler->getGCForeground(col), x, y, w, h);
+ return *this;
+}
+
+
+PainterBase & Painter::fillPolygon(int const * xp, int const * yp, int np,
+ LColor::color col)
+{
+ boost::scoped_array<XPoint> points(new XPoint[np]);
+
+ for (int i = 0; i < np; ++i) {
+ points[i].x = xp[i];
+ points[i].y = yp[i];
+ }
+
+ XFillPolygon(display(), owner.getPixmap(),
+ lyxColorHandler->getGCForeground(col), points.get(), np,
+ Nonconvex, CoordModeOrigin);
+
+ return *this;
+}
+
+
+PainterBase & Painter::arc(int x, int y,
+ unsigned int w, unsigned int h,
+ int a1, int a2, LColor::color col)
+{
+ XDrawArc(display(), owner.getPixmap(),
+ lyxColorHandler->getGCForeground(col),
+ x, y, w, h, a1, a2);
+ return *this;
+}
+
+
+/// Draw lines from x1,y1 to x2,y2. They are arrays
+PainterBase & Painter::segments(int const * x1, int const * y1,
+ int const * x2, int const * y2, int ns,
+ LColor::color col,
+ enum line_style ls, enum line_width lw)
+{
+ boost::scoped_array<XSegment> s(new XSegment[ns]);
+
+ for (int i = 0; i < ns; ++i) {
+ s[i].x1 = x1[i];
+ s[i].y1 = y1[i];
+ s[i].x2 = x2[i];
+ s[i].y2 = y2[i];
+ }
+ XDrawSegments(display(), owner.getPixmap(),
+ lyxColorHandler->getGCLinepars(ls, lw, col),
+ s.get(), ns);
+
+ return *this;
+}
+
+
+PainterBase & Painter::image(int x, int y, int w, int h,
+ grfx::GImage const & image)
+{
+ XGCValues val;
+ val.function = GXcopy;
+ GC gc = XCreateGC(display(), owner.getPixmap(),
+ GCFunction, &val);
+ XCopyArea(display(), image.getPixmap(), owner.getPixmap(), gc,
+ 0, 0, w, h, x, y);
+ XFreeGC(display(), gc);
+ return *this;
+}
+
+
+PainterBase & Painter::text(int x, int y, string const & s, LyXFont const & f)
+{
+ return text(x, y, s.data(), s.length(), f);
+}
+
+
+PainterBase & Painter::text(int x, int y, char c, LyXFont const & f)
+{
+ char s[2] = { c, '\0' };
+ return text(x, y, s, 1, f);
+}
+
+
+PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
+ LyXFont const & f)
+{
+ if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
+ boost::scoped_array<XChar2b> xs(new XChar2b[ls]);
+ Encoding const * encoding = f.language()->encoding();
+ LyXFont font(f);
+ if (f.isSymbolFont()) {
+#ifdef USE_UNICODE_FOR_SYMBOLS
+ font.setFamily(LyXFont::ROMAN_FAMILY);
+ font.setShape(LyXFont::UP_SHAPE);
+#endif
+ encoding = encodings.symbol_encoding();
+ }
+ for (size_t i = 0; i < ls; ++i) {
+ Uchar c = encoding->ucs(s[i]);
+ xs[i].byte1 = c >> 8;
+ xs[i].byte2 = c & 0xff;
+ }
+ text(x , y, xs.get(), ls, font);
+ return *this;
+ }
+
+ GC gc = lyxColorHandler->getGCForeground(f.realColor());
+ if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
+ lyxfont::XSetFont(display(), gc, f);
+ XDrawString(display(), owner.getPixmap(), gc, x, y, s, ls);
+ } else {
+ LyXFont smallfont(f);
+ smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
+ int tmpx = x;
+ for (size_t i = 0; i < ls; ++i) {
+ char const c = uppercase(s[i]);
+ if (c != s[i]) {
+ lyxfont::XSetFont(display(), gc, smallfont);
+ XDrawString(display(), owner.getPixmap(), gc,
+ tmpx, y, &c, 1);
+ tmpx += lyxfont::XTextWidth(smallfont, &c, 1);
+ } else {
+ lyxfont::XSetFont(display(), gc, f);
+ XDrawString(display(), owner.getPixmap(), gc,
+ tmpx, y, &c, 1);
+ tmpx += lyxfont::XTextWidth(f, &c, 1);
+ }
+ }
+ }
+
+ if (f.underbar() == LyXFont::ON) {
+ underline(f, x, y, lyxfont::width(s, ls, f));
+ }
+
+ return *this;
+}
+
+
+PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
+ LyXFont const & f)
+{
+ GC gc = lyxColorHandler->getGCForeground(f.realColor());
+ if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
+ lyxfont::XSetFont(display(), gc, f);
+ XDrawString16(display(), owner.getPixmap(), gc, x, y, s, ls);
+ } else {
+ LyXFont smallfont(f);
+ smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
+ static XChar2b c;
+ int tmpx = x;
+ for (int i = 0; i < ls; ++i) {
+ if (s[i].byte1)
+ c = s[i];
+ else {
+ c.byte1 = s[i].byte1;
+ c.byte2 = uppercase(s[i].byte2);
+ }
+ if (c.byte2 != s[i].byte2) {
+ lyxfont::XSetFont(display(), gc, smallfont);
+ XDrawString16(display(), owner.getPixmap(), gc,
+ tmpx, y, &c, 1);
+ tmpx += lyxfont::XTextWidth16(smallfont, &c, 1);
+ } else {
+ lyxfont::XSetFont(display(), gc, f);
+ XDrawString16(display(), owner.getPixmap(), gc,
+ tmpx, y, &c, 1);
+ tmpx += lyxfont::XTextWidth16(f, &c, 1);
+ }
+ }
+ }
+
+ if (f.underbar() == LyXFont::ON) {
+ underline(f, x, y, lyxfont::width(s, ls, f));
+ }
+
+ return *this;
+}
+
+
+void Painter::underline(LyXFont const & f, int x, int y, int width)
+{
+ int const below = max(lyxfont::maxDescent(f) / 2, 2);
+ int const height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
+ if (height < 2)
+ line(x, y + below, x + width, y + below, f.color());
+ else
+ fillRectangle(x, y + below, width, below + height,
+ f.color());
+}
Index: src/frontends/Painter.h
===================================================================
RCS file: src/frontends/Painter.h
diff -N src/frontends/Painter.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/Painter.h 23 May 2002 05:30:08 -0000
@@ -0,0 +1,101 @@
+// -*- C++ -*-
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 1995-2001 The LyX Team
+ *
+ * ======================================================*/
+
+#ifndef PAINTER_H
+#define PAINTER_H
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "LString.h"
+
+// This is only included to provide stuff for the non-public sections
+#include <X11/Xlib.h>
+
+#include "PainterBase.h"
+
+class LyXFont;
+class WorkArea;
+
+/** An inplementation for the X Window System. Xlib.
+ Classes similar to this one can be made for gtk+, Qt, etc.
+*/
+class Painter : public PainterBase {
+public:
+ /// Constructor
+ explicit Painter(WorkArea &);
+
+ /// Draw a line from point to point
+ PainterBase & line(int x1, int y1, int x2, int y2,
+ LColor::color = LColor::foreground,
+ enum line_style = line_solid,
+ enum line_width = line_thin);
+
+ /// Here xp and yp are arrays of points
+ PainterBase & lines(int const * xp, int const * yp, int np,
+ LColor::color = LColor::foreground,
+ enum line_style = line_solid,
+ enum line_width = line_thin);
+
+ /// Here xp and yp are arrays of points
+ PainterBase & fillPolygon(int const * xp, int const * yp, int np,
+ LColor::color = LColor::foreground);
+
+ /// Draw lines from x1,y1 to x2,y2. They are arrays
+ PainterBase & segments(int const * x1, int const * y1,
+ int const * x2, int const * y2, int ns,
+ LColor::color = LColor::foreground,
+ enum line_style = line_solid,
+ enum line_width = line_thin);
+
+ /// Draw a rectangle
+ PainterBase & rectangle(int x, int y, int w, int h,
+ LColor::color = LColor::foreground,
+ enum line_style = line_solid,
+ enum line_width = line_thin);
+
+ /// Draw an arc
+ PainterBase & arc(int x, int y, unsigned int w, unsigned int h,
+ int a1, int a2,
+ LColor::color = LColor::foreground);
+
+ /// Draw a pixel
+ PainterBase & point(int x, int y, LColor::color = LColor::foreground);
+
+ /// Fill a rectangle
+ PainterBase & fillRectangle(int x, int y, int w, int h,
+ LColor::color);
+
+ /// For the graphics inset.
+ PainterBase & image(int x, int y, int w, int h,
+ grfx::GImage const & image);
+
+ /// Draw a string at position x, y (y is the baseline)
+ PainterBase & text(int x, int y,
+ string const & str, LyXFont const & f);
+
+ /** Draw a string at position x, y (y is the baseline)
+ This is just for fast drawing */
+ PainterBase & text(int x, int y, char const * str, size_t l,
+ LyXFont const & f);
+
+ /// Draw a char at position x, y (y is the baseline)
+ PainterBase & text(int x, int y, char c, LyXFont const & f);
+
+ /// Draw a wide string at position x, y
+ PainterBase & text(int x, int y, XChar2b const * str, int l,
+ LyXFont const & f);
+private:
+ /// Check the font, and if set, draw an underline
+ void underline(LyXFont const & f, int x, int y, int width);
+};
+
+#endif
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.424
diff -u -r1.424 ChangeLog
--- src/insets/ChangeLog 22 May 2002 01:16:36 -0000 1.424
+++ src/insets/ChangeLog 23 May 2002 05:30:28 -0000
@@ -1,3 +1,19 @@
+2002-05-23 John Levon <[EMAIL PROTECTED]>
+
+ * inset.C:
+ * insetbutton.C:
+ * insetcaption.C:
+ * insetcollapsable.C:
+ * insetcommand.C:
+ * inseterror.C:
+ * insetgraphics.C:
+ * insetgraphicsParams.C:
+ * insetlatexaccent.C:
+ * insetquotes.C:
+ * insetspecialchar.C:
+ * insettabular.C:
+ * insettext.C: move Painter to frontends/
+
2002-05-22 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* insettabular.h: use more specific smart_ptr header.
Index: src/insets/inset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inset.C,v
retrieving revision 1.74
diff -u -r1.74 inset.C
--- src/insets/inset.C 21 Mar 2002 17:09:47 -0000 1.74
+++ src/insets/inset.C 23 May 2002 05:30:28 -0000
@@ -18,7 +18,7 @@
#include "debug.h"
#include "BufferView.h"
#include "support/lstrings.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "commandtags.h"
#include "support/lstrings.h"
#include "gettext.h"
Index: src/insets/insetbutton.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbutton.C,v
retrieving revision 1.16
diff -u -r1.16 insetbutton.C
--- src/insets/insetbutton.C 21 Mar 2002 17:09:47 -0000 1.16
+++ src/insets/insetbutton.C 23 May 2002 05:30:28 -0000
@@ -17,7 +17,7 @@
#include "insetbutton.h"
#include "debug.h"
#include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "support/LAssert.h"
#include "lyxfont.h"
#include "font.h"
Index: src/insets/insetcaption.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcaption.C,v
retrieving revision 1.14
diff -u -r1.14 insetcaption.C
--- src/insets/insetcaption.C 21 Mar 2002 17:09:48 -0000 1.14
+++ src/insets/insetcaption.C 23 May 2002 05:30:28 -0000
@@ -15,7 +15,7 @@
#endif
#include "insetcaption.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "BufferView.h"
#include "FloatList.h"
Index: src/insets/insetcollapsable.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcollapsable.C,v
retrieving revision 1.107
diff -u -r1.107 insetcollapsable.C
--- src/insets/insetcollapsable.C 14 May 2002 11:11:02 -0000 1.107
+++ src/insets/insetcollapsable.C 23 May 2002 05:30:28 -0000
@@ -18,7 +18,7 @@
#include "gettext.h"
#include "lyxfont.h"
#include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "debug.h"
#include "lyxtext.h"
#include "font.h"
Index: src/insets/insetcommand.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetcommand.C,v
retrieving revision 1.47
diff -u -r1.47 insetcommand.C
--- src/insets/insetcommand.C 21 Mar 2002 17:09:48 -0000 1.47
+++ src/insets/insetcommand.C 23 May 2002 05:30:28 -0000
@@ -16,7 +16,7 @@
#include "insetcommand.h"
#include "debug.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "lyxlex.h"
using std::ostream;
Index: src/insets/inseterror.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/inseterror.C,v
retrieving revision 1.39
diff -u -r1.39 inseterror.C
--- src/insets/inseterror.C 21 Mar 2002 17:09:48 -0000 1.39
+++ src/insets/inseterror.C 23 May 2002 05:30:28 -0000
@@ -20,7 +20,7 @@
#include "gettext.h"
#include "inseterror.h"
#include "LyXView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "frontends/Dialogs.h"
using std::ostream;
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.110
diff -u -r1.110 insetgraphics.C
--- src/insets/insetgraphics.C 21 May 2002 23:50:35 -0000 1.110
+++ src/insets/insetgraphics.C 23 May 2002 05:30:28 -0000
@@ -86,7 +86,7 @@
#include "buffer.h"
#include "BufferView.h"
#include "converter.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "lyxrc.h"
#include "font.h" // For the lyxfont class.
#include "debug.h"
Index: src/insets/insetgraphicsParams.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphicsParams.C,v
retrieving revision 1.36
diff -u -r1.36 insetgraphicsParams.C
--- src/insets/insetgraphicsParams.C 7 May 2002 10:02:02 -0000 1.36
+++ src/insets/insetgraphicsParams.C 23 May 2002 05:30:28 -0000
@@ -215,7 +215,7 @@
}
-bool InsetGraphicsParams::Read(LyXLex & lex, string const& token)
+bool InsetGraphicsParams::Read(LyXLex & lex, string const & token)
{
if (token == "filename") {
lex.next();
Index: src/insets/insetlatexaccent.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetlatexaccent.C,v
retrieving revision 1.51
diff -u -r1.51 insetlatexaccent.C
--- src/insets/insetlatexaccent.C 21 Mar 2002 17:09:49 -0000 1.51
+++ src/insets/insetlatexaccent.C 23 May 2002 05:30:28 -0000
@@ -19,7 +19,7 @@
#include "lyxrc.h"
#include "support/lstrings.h"
#include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "language.h"
Index: src/insets/insetquotes.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetquotes.C,v
retrieving revision 1.64
diff -u -r1.64 insetquotes.C
--- src/insets/insetquotes.C 21 Mar 2002 17:09:50 -0000 1.64
+++ src/insets/insetquotes.C 23 May 2002 05:30:30 -0000
@@ -20,7 +20,7 @@
#include "support/lstrings.h"
#include "BufferView.h"
#include "LaTeXFeatures.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "buffer.h"
#include "debug.h"
#include "font.h"
Index: src/insets/insetspecialchar.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetspecialchar.C,v
retrieving revision 1.48
diff -u -r1.48 insetspecialchar.C
--- src/insets/insetspecialchar.C 27 Mar 2002 00:05:28 -0000 1.48
+++ src/insets/insetspecialchar.C 23 May 2002 05:30:30 -0000
@@ -17,7 +17,7 @@
#include "debug.h"
#include "LaTeXFeatures.h"
#include "BufferView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "lyxlex.h"
#include "lyxfont.h"
Index: src/insets/insettabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettabular.C,v
retrieving revision 1.201
diff -u -r1.201 insettabular.C
--- src/insets/insettabular.C 3 May 2002 10:17:56 -0000 1.201
+++ src/insets/insettabular.C 23 May 2002 05:30:35 -0000
@@ -22,7 +22,7 @@
#include "lyxfunc.h"
#include "debug.h"
#include "LaTeXFeatures.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "lyxtext.h"
#include "LyXView.h"
Index: src/insets/insettext.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insettext.C,v
retrieving revision 1.294
diff -u -r1.294 insettext.C
--- src/insets/insettext.C 15 May 2002 23:49:07 -0000 1.294
+++ src/insets/insettext.C 23 May 2002 05:30:40 -0000
@@ -25,7 +25,7 @@
#include "BufferView.h"
#include "lyxtextclasslist.h"
#include "LaTeXFeatures.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "lyxtext.h"
#include "lyxcursor.h"
#include "CutAndPaste.h"
Index: src/mathed/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/ChangeLog,v
retrieving revision 1.229
diff -u -r1.229 ChangeLog
--- src/mathed/ChangeLog 22 May 2002 01:16:37 -0000 1.229
+++ src/mathed/ChangeLog 23 May 2002 05:30:47 -0000
@@ -1,3 +1,27 @@
+2002-05-23 John Levon <[EMAIL PROTECTED]>
+
+ * formula.C:
+ * formulabase.C:
+ * formulamacro.C:
+ * math_binaryopinset.C:
+ * math_casesinset.C:
+ * math_charinset.C:
+ * math_cursor.C:
+ * math_fracinset.C:
+ * math_funcinset.C:
+ * math_gridinset.C:
+ * math_hullinset.C:
+ * math_macro.C:
+ * math_macrotemplate.C:
+ * math_rootinset.C:
+ * math_spaceinset.C:
+ * math_sqrtinset.C:
+ * math_stringinset.C:
+ * math_support.C:
+ * math_unknowninset.C:
+ * math_xdata.C:
+ * math_xyarrowinset.C: move Painter to frontends/
+
2002-05-22 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* math_exintinset.C: use more specific smart_ptr header.
Index: src/mathed/formula.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formula.C,v
retrieving revision 1.190
diff -u -r1.190 formula.C
--- src/mathed/formula.C 2 May 2002 07:30:49 -0000 1.190
+++ src/mathed/formula.C 23 May 2002 05:30:47 -0000
@@ -36,7 +36,7 @@
#include "support/systemcall.h"
#include "support/filetools.h" // LibFileSearch
#include "LyXView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "lyxrc.h"
#include "math_hullinset.h"
#include "math_support.h"
Index: src/mathed/formulabase.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formulabase.C,v
retrieving revision 1.154
diff -u -r1.154 formulabase.C
--- src/mathed/formulabase.C 15 May 2002 21:53:28 -0000 1.154
+++ src/mathed/formulabase.C 23 May 2002 05:30:48 -0000
@@ -34,7 +34,7 @@
#include "math_support.h"
#include "support/lstrings.h"
#include "LyXView.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "Lsstream.h"
#include "math_arrayinset.h"
Index: src/mathed/formulamacro.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/formulamacro.C,v
retrieving revision 1.95
diff -u -r1.95 formulamacro.C
--- src/mathed/formulamacro.C 17 Apr 2002 05:25:45 -0000 1.95
+++ src/mathed/formulamacro.C 23 May 2002 05:30:49 -0000
@@ -27,7 +27,7 @@
#include "math_mathmlstream.h"
#include "BufferView.h"
#include "gettext.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "font.h"
#include "support/lyxlib.h"
#include "support/LOstream.h"
Index: src/mathed/math_binaryopinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_binaryopinset.C,v
retrieving revision 1.7
diff -u -r1.7 math_binaryopinset.C
--- src/mathed/math_binaryopinset.C 21 Mar 2002 17:42:55 -0000 1.7
+++ src/mathed/math_binaryopinset.C 23 May 2002 05:30:49 -0000
@@ -5,7 +5,7 @@
#endif
#include "math_binaryopinset.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "support/LOstream.h"
#include "math_support.h"
#include "math_mathmlstream.h"
Index: src/mathed/math_casesinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_casesinset.C,v
retrieving revision 1.6
diff -u -r1.6 math_casesinset.C
--- src/mathed/math_casesinset.C 21 Mar 2002 17:42:55 -0000 1.6
+++ src/mathed/math_casesinset.C 23 May 2002 05:30:49 -0000
@@ -8,7 +8,7 @@
#include "math_parser.h"
#include "math_mathmlstream.h"
#include "math_support.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
MathCasesInset::MathCasesInset(row_type n)
Index: src/mathed/math_charinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_charinset.C,v
retrieving revision 1.38
diff -u -r1.38 math_charinset.C
--- src/mathed/math_charinset.C 21 Mar 2002 17:42:55 -0000 1.38
+++ src/mathed/math_charinset.C 23 May 2002 05:30:49 -0000
@@ -6,7 +6,7 @@
#include "math_charinset.h"
#include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "support/LOstream.h"
#include "font.h"
#include "debug.h"
Index: src/mathed/math_cursor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_cursor.C,v
retrieving revision 1.261
diff -u -r1.261 math_cursor.C
--- src/mathed/math_cursor.C 15 May 2002 23:49:08 -0000 1.261
+++ src/mathed/math_cursor.C 23 May 2002 05:30:54 -0000
@@ -26,7 +26,7 @@
#include "support/LAssert.h"
#include "debug.h"
#include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "math_cursor.h"
#include "formulabase.h"
#include "math_arrayinset.h"
Index: src/mathed/math_fracinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_fracinset.C,v
retrieving revision 1.45
diff -u -r1.45 math_fracinset.C
--- src/mathed/math_fracinset.C 25 Apr 2002 15:37:10 -0000 1.45
+++ src/mathed/math_fracinset.C 23 May 2002 05:30:54 -0000
@@ -4,7 +4,7 @@
#include "math_fracinset.h"
#include "math_support.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "math_mathmlstream.h"
#include "textpainter.h"
Index: src/mathed/math_funcinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_funcinset.C,v
retrieving revision 1.37
diff -u -r1.37 math_funcinset.C
--- src/mathed/math_funcinset.C 21 Mar 2002 17:42:55 -0000 1.37
+++ src/mathed/math_funcinset.C 23 May 2002 05:30:54 -0000
@@ -6,7 +6,7 @@
#include "math_funcinset.h"
#include "font.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "math_support.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
Index: src/mathed/math_gridinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_gridinset.C,v
retrieving revision 1.63
diff -u -r1.63 math_gridinset.C
--- src/mathed/math_gridinset.C 8 Apr 2002 09:37:27 -0000 1.63
+++ src/mathed/math_gridinset.C 23 May 2002 05:30:54 -0000
@@ -6,7 +6,7 @@
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "lyxfont.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "debug.h"
Index: src/mathed/math_hullinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_hullinset.C,v
retrieving revision 1.22
diff -u -r1.22 math_hullinset.C
--- src/mathed/math_hullinset.C 2 May 2002 07:30:49 -0000 1.22
+++ src/mathed/math_hullinset.C 23 May 2002 05:30:57 -0000
@@ -9,7 +9,7 @@
#include "math_streamstr.h"
#include "math_support.h"
#include "debug.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "textpainter.h"
#include "Lsstream.h"
#include "LaTeXFeatures.h"
Index: src/mathed/math_macro.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_macro.C,v
retrieving revision 1.101
diff -u -r1.101 math_macro.C
--- src/mathed/math_macro.C 3 Apr 2002 10:45:31 -0000 1.101
+++ src/mathed/math_macro.C 23 May 2002 05:30:57 -0000
@@ -28,7 +28,7 @@
#include "support/lstrings.h"
#include "support/LAssert.h"
#include "debug.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "LaTeXFeatures.h"
Index: src/mathed/math_macrotemplate.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_macrotemplate.C,v
retrieving revision 1.44
diff -u -r1.44 math_macrotemplate.C
--- src/mathed/math_macrotemplate.C 25 Mar 2002 12:11:25 -0000 1.44
+++ src/mathed/math_macrotemplate.C 23 May 2002 05:30:57 -0000
@@ -4,7 +4,7 @@
#include "math_macrotemplate.h"
#include "math_mathmlstream.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "debug.h"
Index: src/mathed/math_rootinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_rootinset.C,v
retrieving revision 1.20
diff -u -r1.20 math_rootinset.C
--- src/mathed/math_rootinset.C 21 Mar 2002 17:42:56 -0000 1.20
+++ src/mathed/math_rootinset.C 23 May 2002 05:30:57 -0000
@@ -17,7 +17,7 @@
#include "math_rootinset.h"
#include "math_mathmlstream.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
using std::max;
Index: src/mathed/math_spaceinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_spaceinset.C,v
retrieving revision 1.28
diff -u -r1.28 math_spaceinset.C
--- src/mathed/math_spaceinset.C 25 Mar 2002 12:11:25 -0000 1.28
+++ src/mathed/math_spaceinset.C 23 May 2002 05:30:57 -0000
@@ -5,7 +5,7 @@
#include "math_spaceinset.h"
#include "math_support.h"
#include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "math_mathmlstream.h"
Index: src/mathed/math_sqrtinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_sqrtinset.C,v
retrieving revision 1.32
diff -u -r1.32 math_sqrtinset.C
--- src/mathed/math_sqrtinset.C 25 Apr 2002 05:58:55 -0000 1.32
+++ src/mathed/math_sqrtinset.C 23 May 2002 05:30:57 -0000
@@ -5,7 +5,7 @@
#include "math_sqrtinset.h"
#include "math_mathmlstream.h"
#include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "textpainter.h"
Index: src/mathed/math_stringinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_stringinset.C,v
retrieving revision 1.14
diff -u -r1.14 math_stringinset.C
--- src/mathed/math_stringinset.C 21 Mar 2002 17:42:56 -0000 1.14
+++ src/mathed/math_stringinset.C 23 May 2002 05:30:57 -0000
@@ -8,7 +8,7 @@
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "math_support.h"
#include "math_parser.h"
#include "LaTeXFeatures.h"
Index: src/mathed/math_support.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_support.C,v
retrieving revision 1.31
diff -u -r1.31 math_support.C
--- src/mathed/math_support.C 4 Apr 2002 14:48:39 -0000 1.31
+++ src/mathed/math_support.C 23 May 2002 05:30:58 -0000
@@ -10,7 +10,7 @@
#include "math_defs.h"
#include "math_inset.h"
#include "math_parser.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "debug.h"
#include "commandtags.h"
Index: src/mathed/math_unknowninset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_unknowninset.C,v
retrieving revision 1.5
diff -u -r1.5 math_unknowninset.C
--- src/mathed/math_unknowninset.C 21 Mar 2002 17:42:56 -0000 1.5
+++ src/mathed/math_unknowninset.C 23 May 2002 05:30:58 -0000
@@ -6,7 +6,7 @@
#include "math_unknowninset.h"
#include "font.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "math_support.h"
#include "math_mathmlstream.h"
#include "math_streamstr.h"
Index: src/mathed/math_xdata.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_xdata.C,v
retrieving revision 1.19
diff -u -r1.19 math_xdata.C
--- src/mathed/math_xdata.C 21 Mar 2002 17:42:56 -0000 1.19
+++ src/mathed/math_xdata.C 23 May 2002 05:30:58 -0000
@@ -6,7 +6,7 @@
#include "math_scriptinset.h"
#include "math_support.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "textpainter.h"
#include "debug.h"
Index: src/mathed/math_xyarrowinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_xyarrowinset.C,v
retrieving revision 1.7
diff -u -r1.7 math_xyarrowinset.C
--- src/mathed/math_xyarrowinset.C 21 Mar 2002 17:42:56 -0000 1.7
+++ src/mathed/math_xyarrowinset.C 23 May 2002 05:30:58 -0000
@@ -9,7 +9,7 @@
#include "math_mathmlstream.h"
#include "math_streamstr.h"
#include "math_support.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
#include "debug.h"
