diff --git a/Makefile.am b/Makefile.am index 9f42c27ff7..79d24eede6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,40 +24,6 @@ man_MANS = lyx.1 bindistdir=$(PWD)/lyxbin bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz -dist_noinst_DATA = \ - images/ChangeLog \ - images/README \ - images/ams_arrows.xbm \ - images/ams_misc.xbm \ - images/ams_nrel.xbm \ - images/ams_ops.xbm \ - images/ams_rel.xbm \ - images/arrows.xbm \ - images/bop.xbm \ - images/brel.xbm \ - images/deco.xbm \ - images/deco.xpm \ - images/delim.xbm \ - images/delim.xpm \ - images/delim0.xpm \ - images/delim1.xpm \ - images/dots.xbm \ - images/equation.xpm \ - images/font.xbm \ - images/font.xpm \ - images/frac.xpm \ - images/greek.xbm \ - images/matrix.xpm \ - images/misc.xbm \ - images/smallcaps.xpm \ - images/space.xpm \ - images/sqrt.xpm \ - images/style.xbm \ - images/style.xpm \ - images/sub.xpm \ - images/super.xpm \ - images/varsz.xbm - lyx.1: cp -p $(srcdir)/lyx.man lyx.1 diff --git a/images/ChangeLog b/images/ChangeLog deleted file mode 100644 index 7e8b8d0628..0000000000 --- a/images/ChangeLog +++ /dev/null @@ -1,111 +0,0 @@ -2003-10-07 Angus Leeming - - * deco.xpm: - * delim.xpm: - * delim0.xpm: - * delim1.xpm: - * equation.xpm: - * frac.xpm: - * matrix.xpm: - * smallcaps.xpm: - * space.xpm: - * sqrt.xpm: - * style.xpm: - * sub.xpm: - * super.xpm: replace rgb.txt names with #rrggbb eqivalent. - -2002-06-15 Martin Vermeer - - * delim.xbm: - * delim1.xpm: Redesign of Delimiters dialogue in mathed. - Cleaner, smaller. - -2002-06-12 Jean-Marc Lasgouttes - - * delim1.xpm: new file - -2002-04-17 Angus Leeming - - * deco.xpm - * delim.xpm - * delim0.xpm - * equation.xpm - * frac.xpm - * matrix.xpm - * smallcaps.xpm - * space.xpm - * sqrt.xpm - * sub.xpm - * super.xpm: - fix broken colour in sub/super.xpm that I introduced last time around - and use the same 4 colours for all xpm files. - -2002-04-17 Angus Leeming - - * deco.xpm - * smallcaps.xpm - * space.xpm - * sub.xpm - * super.xpm : - Rewrite any 13 char colour strings as the equivalent 7 char string, - by running them past fl_lookup_RGBcolor. - For example, "#BEFBBEFBBEFB" becomes "#bebebe". - -2002-03-18 Jean-Marc Lasgouttes - - * style.xbm: - * font.xbm: - * deco.xbm: remove first, empty line (again!) - -2002-03-07 Martin Vermeer - - * style.xbm: - * font.xbm: Improved the bitmaps. - - * deco.xbm: added leftright arrows. - -2002-01-28 Angus Leeming - - * ams_arrows.xbm: - * ams_misc.xbm: - * deco.xbm: - * font.xbm: - * style.xbm: removed first, empty line. - - * style.xbm: the defined height didn't match what is in the bitmap. - It does now. - -2002-01-28 Martin Vermeer - - * style.xbm: - * font.xbm: new files. The bitmaps for the maths style dialog. - -2002-01-28 Martin Vermeer - - * deco.xbm: added math accents as a separate bitmap to the Decorations - sub-panel of mathed. See Lamport Table 3.11. - - * ams_rel.xbm: - * ams_nrel.xbm: shorten and broaden the pixmaps. - -2002-01-17 Martin Vermeer - - * ams_arrows.xbm: - * ams_rel.xbm: - * ams_nrel.xbm: - * ams_misc.xbm: - * ams_ops.xbm: Bitmap files for the maths sub-panels. - -2002-01-14 Martin Vermeer - - * misc.xpm: added maths sub-panels for Blackboard Bold - and Calligraphic math symbols. - -2002-01-09 Martin Vermeer - - * style.xpm: style button for the math panel - -2002-01-03 Martin Vermeer - - * super.xpm: - * sub.xpm: sub- and superscript buttons for the math panel diff --git a/lib/Makefile.am b/lib/Makefile.am index 510eae7574..850c68a9ae 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -16,6 +16,39 @@ dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure.py \ lyxrc.defaults textclass.lst packages.lst external_templates \ encodings languages symbols syntax.default +dist_noinst_DATA = \ + images/README \ + images/font-smallcaps.xpm \ + images/math/ams_arrows.xbm \ + images/math/ams_misc.xbm \ + images/math/ams_nrel.xbm \ + images/math/ams_ops.xbm \ + images/math/ams_rel.xbm \ + images/math/arrows.xbm \ + images/math/bop.xbm \ + images/math/brel.xbm \ + images/math/deco.xbm \ + images/math/deco.xpm \ + images/math/delim0.xpm \ + images/math/delim1.xpm \ + images/math/delim.xbm \ + images/math/delim.xpm \ + images/math/dots.xbm \ + images/math/equation.xpm \ + images/math/font.xbm \ + images/math/font.xpm \ + images/math/frac-square.xpm \ + images/math/greek.xbm \ + images/math/matrix.xpm \ + images/math/misc.xbm \ + images/math/space.xpm \ + images/math/sqrt-square.xpm \ + images/math/style.xbm \ + images/math/style.xpm \ + images/math/sub.xpm \ + images/math/super.xpm \ + images/math/varsz.xbm + binddir = $(pkgdatadir)/bind dist_bind_DATA = \ bind/broadway.bind \ diff --git a/images/README b/lib/images/README similarity index 100% rename from images/README rename to lib/images/README diff --git a/images/smallcaps.xpm b/lib/images/font-smallcaps.xpm similarity index 50% rename from images/smallcaps.xpm rename to lib/images/font-smallcaps.xpm index 5263b748ba..7dd884a0d5 100644 --- a/images/smallcaps.xpm +++ b/lib/images/font-smallcaps.xpm @@ -23,30 +23,5 @@ static char const * smallcaps_xpm[] = { " ", " ", " "}; -/* XPM */ -static char * smallcaps_xpm[] = { -"20 20 2 1", -" c None", -". c #000000", -" ", -" ", -" ", -" ", -" ", -" . ", -" . ", -" . . .... .... ", -" . . . . .. ", -" . . . . . ", -" ..... ... . ", -" . . . . . ", -" . . . . .. ", -"... ...... .... ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/images/ams_arrows.xbm b/lib/images/math/ams_arrows.xbm similarity index 100% rename from images/ams_arrows.xbm rename to lib/images/math/ams_arrows.xbm diff --git a/images/ams_misc.xbm b/lib/images/math/ams_misc.xbm similarity index 100% rename from images/ams_misc.xbm rename to lib/images/math/ams_misc.xbm diff --git a/images/ams_nrel.xbm b/lib/images/math/ams_nrel.xbm similarity index 100% rename from images/ams_nrel.xbm rename to lib/images/math/ams_nrel.xbm diff --git a/images/ams_ops.xbm b/lib/images/math/ams_ops.xbm similarity index 100% rename from images/ams_ops.xbm rename to lib/images/math/ams_ops.xbm diff --git a/images/ams_rel.xbm b/lib/images/math/ams_rel.xbm similarity index 100% rename from images/ams_rel.xbm rename to lib/images/math/ams_rel.xbm diff --git a/images/arrows.xbm b/lib/images/math/arrows.xbm similarity index 100% rename from images/arrows.xbm rename to lib/images/math/arrows.xbm diff --git a/images/bop.xbm b/lib/images/math/bop.xbm similarity index 100% rename from images/bop.xbm rename to lib/images/math/bop.xbm diff --git a/images/brel.xbm b/lib/images/math/brel.xbm similarity index 100% rename from images/brel.xbm rename to lib/images/math/brel.xbm diff --git a/images/deco.xbm b/lib/images/math/deco.xbm similarity index 100% rename from images/deco.xbm rename to lib/images/math/deco.xbm diff --git a/images/deco.xpm b/lib/images/math/deco.xpm similarity index 100% rename from images/deco.xpm rename to lib/images/math/deco.xpm diff --git a/images/delim.xbm b/lib/images/math/delim.xbm similarity index 100% rename from images/delim.xbm rename to lib/images/math/delim.xbm diff --git a/images/delim.xpm b/lib/images/math/delim.xpm similarity index 100% rename from images/delim.xpm rename to lib/images/math/delim.xpm diff --git a/images/delim0.xpm b/lib/images/math/delim0.xpm similarity index 100% rename from images/delim0.xpm rename to lib/images/math/delim0.xpm diff --git a/images/delim1.xpm b/lib/images/math/delim1.xpm similarity index 100% rename from images/delim1.xpm rename to lib/images/math/delim1.xpm diff --git a/images/dots.xbm b/lib/images/math/dots.xbm similarity index 100% rename from images/dots.xbm rename to lib/images/math/dots.xbm diff --git a/images/equation.xpm b/lib/images/math/equation.xpm similarity index 100% rename from images/equation.xpm rename to lib/images/math/equation.xpm diff --git a/images/font.xbm b/lib/images/math/font.xbm similarity index 100% rename from images/font.xbm rename to lib/images/math/font.xbm diff --git a/images/font.xpm b/lib/images/math/font.xpm similarity index 95% rename from images/font.xpm rename to lib/images/math/font.xpm index 90bf56d72a..b866f1e01c 100644 --- a/images/font.xpm +++ b/lib/images/math/font.xpm @@ -1,28 +1,28 @@ -/* XPM */ -static char const * style_xpm[] = { -"20 20 5 1", -" c None", -". c #0000ff", -"X c #000000", -"o c #0000ff", -"Y c #0000ff", -" ", -" ...... oooooo ", -" ...... oo oo ", -" .. .. oo oo ", -" ...... ooooooo ", -" ...... oo oo ", -" .. .. oo oo ", -" .. .. oo oo ", -" .. .. oo oo ", -" ", -" XX ", -" XXXX YYYYY ", -" XX XX Y Y ", -" XX XX Y Y ", -" XXXXXXXX YYYYYYY ", -" XX XX Y Y ", -" XX XX Y Y ", -" XX XX Y Y ", -" XX XX YYY YYY ", -" "}; +/* XPM */ +static char const * style_xpm[] = { +"20 20 5 1", +" c None", +". c #0000ff", +"X c #000000", +"o c #0000ff", +"Y c #0000ff", +" ", +" ...... oooooo ", +" ...... oo oo ", +" .. .. oo oo ", +" ...... ooooooo ", +" ...... oo oo ", +" .. .. oo oo ", +" .. .. oo oo ", +" .. .. oo oo ", +" ", +" XX ", +" XXXX YYYYY ", +" XX XX Y Y ", +" XX XX Y Y ", +" XXXXXXXX YYYYYYY ", +" XX XX Y Y ", +" XX XX Y Y ", +" XX XX Y Y ", +" XX XX YYY YYY ", +" "}; diff --git a/images/frac.xpm b/lib/images/math/frac-square.xpm similarity index 100% rename from images/frac.xpm rename to lib/images/math/frac-square.xpm diff --git a/images/greek.xbm b/lib/images/math/greek.xbm similarity index 100% rename from images/greek.xbm rename to lib/images/math/greek.xbm diff --git a/images/matrix.xpm b/lib/images/math/matrix.xpm similarity index 100% rename from images/matrix.xpm rename to lib/images/math/matrix.xpm diff --git a/images/misc.xbm b/lib/images/math/misc.xbm similarity index 100% rename from images/misc.xbm rename to lib/images/math/misc.xbm diff --git a/images/space.xpm b/lib/images/math/space.xpm similarity index 100% rename from images/space.xpm rename to lib/images/math/space.xpm diff --git a/images/sqrt.xpm b/lib/images/math/sqrt-square.xpm similarity index 100% rename from images/sqrt.xpm rename to lib/images/math/sqrt-square.xpm diff --git a/images/style.xbm b/lib/images/math/style.xbm similarity index 100% rename from images/style.xbm rename to lib/images/math/style.xbm diff --git a/images/style.xpm b/lib/images/math/style.xpm similarity index 100% rename from images/style.xpm rename to lib/images/math/style.xpm diff --git a/images/sub.xpm b/lib/images/math/sub.xpm similarity index 100% rename from images/sub.xpm rename to lib/images/math/sub.xpm diff --git a/images/super.xpm b/lib/images/math/super.xpm similarity index 100% rename from images/super.xpm rename to lib/images/math/super.xpm diff --git a/images/varsz.xbm b/lib/images/math/varsz.xbm similarity index 100% rename from images/varsz.xbm rename to lib/images/math/varsz.xbm diff --git a/src/frontends/gtk/GMathPanel.C b/src/frontends/gtk/GMathPanel.C index 898995d784..2181511218 100644 --- a/src/frontends/gtk/GMathPanel.C +++ b/src/frontends/gtk/GMathPanel.C @@ -29,11 +29,11 @@ #include "deco.xpm" #include "delim.xpm" #include "equation.xpm" -#include "frac.xpm" +#include "frac-square.xpm" #include "matrix.xpm" #include "space.xpm" #include "style.xpm" -#include "sqrt.xpm" +#include "sqrt-square.xpm" #include "sub.xpm" #include "super.xpm" diff --git a/src/frontends/gtk/Makefile.am b/src/frontends/gtk/Makefile.am index cb258093f9..9aab91e77f 100644 --- a/src/frontends/gtk/Makefile.am +++ b/src/frontends/gtk/Makefile.am @@ -10,7 +10,7 @@ noinst_LTLIBRARIES = libgtk.la AM_CPPFLAGS += \ $(PCH_FLAGS) \ - -I$(top_srcdir)/images \ + -I$(top_srcdir)/lib/images/math \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/src/frontends/controllers \ diff --git a/src/frontends/qt4/ui/QMathUi.ui b/src/frontends/qt4/ui/QMathUi.ui index 93fab7b016..dfb792d54a 100644 --- a/src/frontends/qt4/ui/QMathUi.ui +++ b/src/frontends/qt4/ui/QMathUi.ui @@ -251,7 +251,7 @@ - ../lib/images/delim.xpm + ../lib/images/math/delim.xpm @@ -270,7 +270,7 @@ - ../lib/images/sub.xpm + ../lib/images/math/sub.xpm @@ -295,7 +295,7 @@ - ../lib/images/font.xpm + ../lib/images/math/font.xpm @@ -322,7 +322,7 @@ - ../lib/images/equation.xpm + ../lib/images/math/equation.xpm @@ -347,7 +347,7 @@ - ../lib/images/space.xpm + ../lib/images/math/space.xpm @@ -366,7 +366,7 @@ - ../lib/images/super.xpm + ../lib/images/math/super.xpm @@ -391,7 +391,7 @@ - ../lib/images/style.xpm + ../lib/images/math/style.xpm @@ -418,7 +418,7 @@ - ../lib/images/frac.xpm + ../lib/images/math/frac-square.xpm @@ -443,7 +443,7 @@ - ../lib/images/sqrt.xpm + ../lib/images/math/sqrt-square.xpm @@ -462,7 +462,7 @@ - ../lib/images/matrix.xpm + ../lib/images/math/matrix.xpm diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C index c6cb941151..ba4f9ec1fd 100644 --- a/src/frontends/xforms/FormMathsPanel.C +++ b/src/frontends/xforms/FormMathsPanel.C @@ -24,11 +24,11 @@ #include "deco.xpm" #include "delim.xpm" #include "equation.xpm" -#include "frac.xpm" +#include "frac-square.xpm" #include "matrix.xpm" #include "space.xpm" #include "style.xpm" -#include "sqrt.xpm" +#include "sqrt-square.xpm" #include "sub.xpm" #include "super.xpm" diff --git a/src/frontends/xforms/Makefile.am b/src/frontends/xforms/Makefile.am index adc87126fa..ed4d9a1635 100644 --- a/src/frontends/xforms/Makefile.am +++ b/src/frontends/xforms/Makefile.am @@ -9,7 +9,7 @@ BUILT_SOURCES = $(PCH_FILE) lyx_forms.h lyx_xpm.h EXTRA_DIST = pch.h lyx_forms.h.in lyx_xpm.h.in AM_CPPFLAGS += \ - -I$(top_srcdir)/images \ + -I$(top_srcdir)/lib/images/math \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/frontends \ -I$(top_srcdir)/src/frontends/controllers \