merge triplicated image format lists

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

diff --git a/lib/configure.py b/lib/configure.py
index 4426b8be66195f654c73bc0f33af252382cc6d28..80acf6572b78ac619232c6d48ed3845a20676dc1 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -500,8 +500,7 @@ def checkFormatEntries(dtl_tools):
     checkViewerEditor('a SVG viewer and editor', ['inkscape'],
         rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"   "vector"'])
     #
-    path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'],
-        rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"      "%s"    ""
+    imageformats = r'''\Format bmp        bmp     BMP                    "" "%s"       "%s"    ""
 \Format gif        gif     GIF                    "" "%s"      "%s"    ""
 \Format jpg       "jpg, jpeg" JPEG                "" "%s"      "%s"    ""
 \Format pbm        pbm     PBM                    "" "%s"      "%s"    ""
@@ -510,28 +509,10 @@ def checkFormatEntries(dtl_tools):
 \Format ppm        ppm     PPM                    "" "%s"      "%s"    ""
 \Format tiff       tif     TIFF                   "" "%s"      "%s"    ""
 \Format xbm        xbm     XBM                    "" "%s"      "%s"    ""
-\Format xpm        xpm     XPM                    "" "%s"      "%s"    ""'''])
-    path, ie = checkEditorNoRC('a raster image editor', ['gimp-remote', 'gimp'],
-        rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"      "%s"    ""
-\Format gif        gif     GIF                    "" "%s"      "%s"    ""
-\Format jpg       "jpg, jpeg" JPEG                "" "%s"      "%s"    ""
-\Format pbm        pbm     PBM                    "" "%s"      "%s"    ""
-\Format pgm        pgm     PGM                    "" "%s"      "%s"    ""
-\Format png        png     PNG                    "" "%s"      "%s"    ""
-\Format ppm        ppm     PPM                    "" "%s"      "%s"    ""
-\Format tiff       tif     TIFF                   "" "%s"      "%s"    ""
-\Format xbm        xbm     XBM                    "" "%s"      "%s"    ""
-\Format xpm        xpm     XPM                    "" "%s"      "%s"    ""'''])
-    addToRC(r'''\Format bmp        bmp     BMP                    "" "%s"      "%s"    ""
-\Format gif        gif     GIF                    "" "%s"      "%s"    ""
-\Format jpg       "jpg, jpeg" JPEG                "" "%s"      "%s"    ""
-\Format pbm        pbm     PBM                    "" "%s"      "%s"    ""
-\Format pgm        pgm     PGM                    "" "%s"      "%s"    ""
-\Format png        png     PNG                    "" "%s"      "%s"    ""
-\Format ppm        ppm     PPM                    "" "%s"      "%s"    ""
-\Format tiff       tif     TIFF                   "" "%s"      "%s"    ""
-\Format xbm        xbm     XBM                    "" "%s"      "%s"    ""
-\Format xpm        xpm     XPM                    "" "%s"      "%s"    ""''' % \
+\Format xpm        xpm     XPM                    "" "%s"      "%s"    ""'''
+    path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats])
+    path, ie = checkEditorNoRC('a raster image editor', ['gimp-remote', 'gimp'], rc_entry = [imageformats])
+    addToRC(imageformats % \
         (iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) )
     #
     checkViewerEditor('a text editor', ['xemacs', 'gvim', 'kedit', 'kwrite', 'kate', \