Remove the images directory

* Makefile.am: remove image files
	* images/ChangeLog: delete
	* images/smallcaps.xpm: move to lib/images/font-smallcaps.xpm
	* lib/Makefile.am: add images to noinst files

Move the following files to lib/images/math:
	* images/README
	* images/delim.xbm
	* images/ams_misc.xbm
	* images/equation.xpm
	* images/delim.xpm
	* images/arrows.xbm
	* images/bop.xbm
	* images/matrix.xpm
	* images/delim0.xpm
	* images/delim1.xpm
	* images/misc.xbm
	* images/greek.xbm
	* images/ams_nrel.xbm
	* images/style.xbm
	* images/ams_ops.xbm
	* images/varsz.xbm
	* images/font.xbm
	* images/sub.xpm
	* images/sqrt.xpm
	* images/dots.xbm
	* images/space.xpm
	* images/deco.xbm
	* images/super.xpm
	* images/ams_arrows.xbm
	* images/style.xpm
	* images/ams_rel.xbm
	* images/brel.xbm
	* images/font.xpm
	* images/deco.xpm
	* images/frac.xpm

Adjust the following files to the moved images:
	* src/frontends/gtk/GMathPanel.C
	* src/frontends/gtk/Makefile.am
	* src/frontends/qt4/ui/QMathUi.ui
	* src/frontends/xforms/Makefile.am
	* src/frontends/xforms/FormMathsPanel.C


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13598 a592a061-630c-0410-9148-cb99ea01b6c8

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
 

images/ChangeLog

@@ -1,111 +0,0 @@
-2003-10-07  Angus Leeming  <leeming@lyx.org>
-
-	* 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  <martin.vermeer@hut.fi>
-
-	* delim.xbm:
-	* delim1.xpm: Redesign of Delimiters dialogue in mathed.
-	  Cleaner, smaller.
-
-2002-06-12  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
-
-	* delim1.xpm: new file
-
-2002-04-17  Angus Leeming <a.leeming@ic.ac.uk>
-
-	* 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 <a.leeming@ic.ac.uk>
-
-	* 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  <lasgouttes@freesurf.fr>
-
-	* style.xbm:
-	* font.xbm:
-	* deco.xbm: remove first, empty line (again!)
-
-2002-03-07  Martin Vermeer <martin.vermeer@hut.fi>
-
-	* style.xbm:
-	* font.xbm: Improved the bitmaps.
-
-	* deco.xbm: added leftright arrows.
-
-2002-01-28  Angus Leeming <a.leeming@ic.ac.uk>
-
-	* 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 <martin.vermeer@hut.fi>
-
-	* style.xbm:
-	* font.xbm: new files.  The bitmaps for the maths style dialog.
-
-2002-01-28  Martin Vermeer <martin.vermeer@hut.fi>
-
-	* 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 <martin.vermeer@hut.fi>
-
-	* 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 <martin.vermeer@hut.fi>
-
-	* misc.xpm: added maths sub-panels for Blackboard Bold
-	and Calligraphic math symbols.
-
-2002-01-09  Martin Vermeer <martin.vermeer@hut.fi>
-
-	* style.xpm: style button for the math panel
-
-2002-01-03  Martin Vermeer <martin.vermeer@hut.fi>
-
-	* super.xpm:
-	* sub.xpm: sub- and superscript buttons for the math panel

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 \

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",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"    .               ",
-"    .               ",
-"   . .  ....   .... ",
-"   . .   .  . ..    ",
-"  .   .  .  . .     ",
-"  .....  ...  .     ",
-"  .   .  .  . .     ",
-" .     . .  . ..    ",
-"...   ......   .... ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    ",
-"                    "};
 
 

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"
 

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 \

src/frontends/qt4/ui/QMathUi.ui

@@ -251,7 +251,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/delim.xpm</iconset>
+         <iconset>../lib/images/math/delim.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -270,7 +270,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/sub.xpm</iconset>
+         <iconset>../lib/images/math/sub.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -295,7 +295,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/font.xpm</iconset>
+         <iconset>../lib/images/math/font.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -322,7 +322,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/equation.xpm</iconset>
+         <iconset>../lib/images/math/equation.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -347,7 +347,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/space.xpm</iconset>
+         <iconset>../lib/images/math/space.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -366,7 +366,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/super.xpm</iconset>
+         <iconset>../lib/images/math/super.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -391,7 +391,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/style.xpm</iconset>
+         <iconset>../lib/images/math/style.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -418,7 +418,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/frac.xpm</iconset>
+         <iconset>../lib/images/math/frac-square.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -443,7 +443,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/sqrt.xpm</iconset>
+         <iconset>../lib/images/math/sqrt-square.xpm</iconset>
         </property>
        </widget>
       </item>
@@ -462,7 +462,7 @@
          <string/>
         </property>
         <property name="icon" >
-         <iconset>../lib/images/matrix.xpm</iconset>
+         <iconset>../lib/images/math/matrix.xpm</iconset>
         </property>
        </widget>
       </item>

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"
 

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 \