applied patches from Wolfgang Hofer

removed script-fu/regex.[ch]


--Sven

ChangeLog

+Mon Jan 24 22:15:46 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* PLUGIN_MAINTAINERS: Simon Budig maintains PageCurl
+
+	* plug-ins/gap/gap_pdb_calls.c
+	* plug-ins/xjt/README
+	* plug-ins/xjt/README_xjt_fileformat.txt
+	* plug-ins/xjt/xjt.c
+	* plug-ins/xjt/xpdb_calls.c
+	* plug-ins/xjt/xpdb_calls.h
+	* po-plug-ins/POTFILES.in: applied (modified) patches from
+	Wolfgang Hofer <hof@hotbot.com>.
+
 Mon Jan 24 21:30:26 CET 2000  Sven Neumann <sven@gimp.org>
 
 	* tips/gimp_tips.pl.txt

PLUGIN_MAINTAINERS

 GIMP Plugins and their maintainers
 ----------------------------------
 
-Created       : Tue Jan  4 21:49:56 2000
-Last Modified : Tue Jan  4 22:21:53 2000 by Sven Neumann <sven@gimp.org>
-
 
 This file lists all GIMP plug-ins and their authors. If you find
 a bug in a plug-in, please check if has already been reported at 
@@ -616,7 +613,7 @@ COMMENT    :
 -----------
 NAME       : pagecurl
 AUTHOR     : Federico Mena Quintero and Simon Budig
-MAINTAINER : 
+MAINTAINER : Simon Budig <Simon.Budig@unix-ag.org> 
 SIZE       :  33.2 kB  in  1 file  (only C files counted)
 COMMENT    : 
 -----------

plug-ins/gap/gap_pdb_calls.c

@@ -485,17 +485,15 @@ gint32   p_gimp_image_add_guide(gint32 image_id, gint32 position, gint32 orienta
    GParam          *return_vals;
    int              nreturn_vals;
 
-   if(orientation == 0 )  /* in GIMP 1.1 we could use (orientation == ORIENTATION_VERTICAL) */
+   if (orientation == ORIENTATION_VERTICAL)
    {
-      l_add_guide_proc = "gimp_image_add_vguide";
+     l_add_guide_proc = "gimp_image_add_vguide";
    }
    else
    {
-      l_add_guide_proc = "gimp_image_add_hguide";
+     l_add_guide_proc = "gimp_image_add_hguide";
    }
 
-
-
    if (p_pdb_procedure_available(l_add_guide_proc) >= 0)
    {
       return_vals = gimp_run_procedure (l_add_guide_proc,

plug-ins/xjt/README

 xjt is a file plug-in to load and save GIMP RGB and GRAY Images with
-all its layers, channels and guides.
-
-Started implementation TATTOO, PARASITE RESOLUTION 1999.02.01
+all its layers, channels, parasites and guides.
 
 (see README_xjt_fileformat.txt for more Information about XJT)
 
 
    The XJT Load/Save Plugin requires:
 
-     - GIMP 1.0.0 (or better)
+     - GIMP 1.1.5 (or better)
      - libjpeg
      - Unix tar
      - Unix gzip   (optional)
      - Unix bzip2  (optional)
-     - gap_patches (optional)  **)
-     
-        **) NO PATCHES are required if you have the latest development version of GIMP 1.1
-
-
 
 Installation:
 -------------
    
-   If You are using GIMP 1.0.2 (or older versions):
-       
-       # (optional) install gap_patches
-       # they are available at the registry at:
-
-       # http://gimp.foebud.org/registry/detailview.phtml?plugin=gap_patches            
-       # or at:
-       # http://gimp.foebud.org/registry/detailview.phtml?plugin=gap
-      
+   The XJT Plugin is Part of the gimp (since 1.1.x development release)
+   and should be built and installed by the gimp installation.
        
-       cp Makefile.1.0 Makefile
-  
-   If you are using GIMP 1.1.1
-   
-       # GIMP 1.1.1 is an unstable prerelease.
-       
-       cp Makefile.1.1 Makefile
- 
-   # edit the Makefile to fit your setup
-   # then type 
-   make            # to compile and
-   make install    # to install the plugin
-   
-   
-
-
-Change Log:
+Change Log: (see also revision history in the source files)
 -----------
+ (XJT 1.1.15,   2000.01.23)
+                  - impementation of parasites
+	          - string prpoerties now can contain \" and \n characters.
+		    Images saved with the new XJT 1.1.15 Plugin
+		    cannot be loaded by the older XJT 1.1 Plugin
+		    if those characters are used in layer or channel names.
+		  - The gimp internal representation of Guide orientation has changed
+		    since the first xjt release (more than one time).
+		    XJT  1.1.15 defines XJT_ORIENTATION_HORIZONTAL 0
+		    for orientation values in the xjt guide property.
+		    and is now independent from the gimp internal representation.
+		    (Gimp's ORIENTATION_HORIZONTAL is translated to XJT_ORIENTATION_HORIZONTAL
+		    
+		    Expect Guide orientation swap problems if
+		    you load xjt 1.1 if they were saved with
+		    older gimp 1.1.x development version prior to gimp 1.1.15
+
+ (XJT 1.1,      1998.10.31 - 1999.03.16)
+       
  1.02  1999.02.??  added load/save for resolution, tattoos, and parasites 
                    (works only with gimp 1.1.1)
  1.01  1998.11.24  added load/save for guides (works only with gimp 1.1)
                    added Makefiles to compile xjt under gimp 1.0.2 and 1.1
-
-Restrictions of the XJT release 1.01:
------------------------------------------
-   The 1.01 implementation of xjt is now able to save and load
-   the full Image Information (including guides) on RGB and GRAY Images.
-   when xjt is used with the latest development version of GIMP 1.1.
-   
-   If xjt is used with GIMP 1.0.2 (or earlier versions)
-   there are some restrictions:
-
-   GUIDES  are ignored at save and load.
-           (GIMP 1.0.2 has no Interface to access GUIDES from a plugin)
-          
-   LINKED to load/save the linked state of a Layer 
-          you must install the GAP_PATCHES to the gimp core.
-          (GIMP 1.0.2 has no Interface to access the Layers LINKED state from a plugin)
-
-   FLOATING_SELECTION
-          are supported by the XJT Fileformat, but you need to apply the GAP_PATCHES
-	  to the gimp core.
-	  Without the patches:
-	  - XJT can not find out the drawable where the floating selection
-	    is attached to. (the PROP_FLOATING_ATTACHED property information
-	    is not saved to the PRP file in that case)
-	  - XJT can not attach the floating selection to a layer or channel
-	    at load. (even if you add the PROP_FLOATING_ATTACHED to the PRP file
-	    with an editor)
-	    
-   
-  The GAP_PATCHES provide some of the missing PDB-interfaces 
-  (except those for guides, tattoos, parasites and resolution)
-  for GIMP-core versions from 1.0.0 upto 1.0.2.  
-

plug-ins/xjt/README_xjt_fileformat.txt

+------------------------------ 
 XJT Fileformat specification:   
 ------------------------------
-
- (XJT 1.1,   1998.10.31 - 1999.03.16)
-       
-----------------------------------------------------------------  
+TODO: 
+  extend and implement xjt fileformat for 
+  - load/save pathes, 
+  - load/save units and user_units
+  
+ (XJT 1.1.15,   2000.01.23)
+ (XJT 1.1,      1998.10.31 - 1999.03.16)
 
    XJT Fileformat was designed to save compressed GIMP Images with
    all the properties that are available in GIMP.
@@ -192,6 +196,7 @@ Syntax of the PRP -file
        (properties for the default values are not written)
 
            PROP_NAME
+	   PROP_PARASITE_FLAGS
 
 --------------------------
 Properties Summary
@@ -247,7 +252,7 @@ Boolean tokens default always to FALSE and become TRUE when specified.
    PROP_TATTOO,                "tto",    PTYP_INT,                 0,
    PROP_PARASITES,             "pte",	 PTYP_INT,		   0,
 
-
+   PROP_PARASITE_FLAGS,        "ptf",    PTYP_INT,                 1,    /* PARASITE_PERSISTENT */
    PROP_FLOATING_ATTACHED,     "fa",	 PTYP_BOOLEAN,  	   FALSE, 
    PROP_NAME,		       "n",	 PTYP_STRING,		   "",
    PROP_DIMENSION,	       "w/h",	 PTYP_2xINT,		   0, 0,
@@ -261,25 +266,39 @@ PROP_OPACITY  valid values are
 	      100.0      (full opaque)
 	      
 PROP_TYPE     valid values are:
-              0 ... RGB 
-	      1 ... GRAY
+              0 ... XJT_RGB 
+	      1 ... XJT_GRAY
 
 PROP_MODE     valid values are:
-              0  ...  NORMAL_MODE
-              1  ...  DISSOLVE_MODE
-              3  ...  MULTIPLY_MODE
-              4  ...  SCREEN_MODE
-              5  ...  OVERLAY_MODE
-              6  ...  DIFFERENCE_MODE
-              7  ...  ADDITION_MODE
-              8  ...  SUBTRACT_MODE
-              9  ...  DARKEN_ONLY_MODE
-              10 ...  LIGHTEN_ONLY_MODE
-              11 ...  HUE_MODE
-              12 ...  SATURATION_MODE
-              13 ...  COLOR_MODE
-              14 ...  VALUE_MODE
+              0  ...  XJT_NORMAL_MODE
+              1  ...  XJT_DISSOLVE_MODE
+	      2  ...  XJT_BEHIND_MODE
+              3  ...  XJT_MULTIPLY_MODE
+              4  ...  XJT_SCREEN_MODE
+              5  ...  XJT_OVERLAY_MODE
+              6  ...  XJT_DIFFERENCE_MODE
+              7  ...  XJT_ADDITION_MODE
+              8  ...  XJT_SUBTRACT_MODE
+              9  ...  XJT_DARKEN_ONLY_MODE
+              10 ...  XJT_LIGHTEN_ONLY_MODE
+              11 ...  XJT_HUE_MODE
+              12 ...  XJT_SATURATION_MODE
+              13 ...  XJT_COLOR_MODE
+              14 ...  XJT_VALUE_MODE
+	      15 ...  XJT_DIVIDE_MODE
  
+PROP_GUIDES
+    valid values for the 1.st integer are positve integers
+    valid values for the 2.nd integer are:
+              0 ... XJT_ORIENTATION_HORIZONTAL
+	      1 ... XJT_ORIENTATION_VERTICAL
+	      
+    Note: 
+     in older xjt files (older than xjt version 1.1.15)
+     there was no exact specification and the gimp internal
+     representation of the guide orientation was written
+     to the xjt guide orientation property.
+     Unforunately this gimp internal representation has changed
 
 
 -----------------------------------------------------------

plug-ins/xjt/xpdb_calls.c

@@ -36,6 +36,7 @@
  */
 
 /* revision history:
+ * version 1.1.15;  2000/01/20  hof: parasites, Translate Guide Orientation to XJT orientation
  * version 1.02.00; 1999/02/01  hof: PDB-calls to load/save resolution tattoos and parasites
  *                                   busy_cursors (needs GIMP 1.1.1)
  * version 1.01.00; 1998/11/22  hof: PDB-calls to load/save guides under GIMP 1.1
@@ -56,6 +57,9 @@
 
 extern int xjt_debug;
 
+#define XJT_ORIENTATION_HORIZONTAL 0
+#define XJT_ORIENTATION_VERTICAL   1
+
 /* ============================================================================
  * p_procedure_available
  *   if requested procedure is available in the PDB return the number of args
@@ -495,7 +499,7 @@ gint32   p_gimp_image_add_guide(gint32 image_id, gint32 position, gint32 orienta
    GParam          *return_vals;
    int              nreturn_vals;
 
-   if(orientation != 1 )  /* in GIMP 1.1 we could use (orientation != ORIENTATION_HORIZONTAL) */
+   if(orientation != XJT_ORIENTATION_HORIZONTAL)
    {
       l_add_guide_proc = "gimp_image_add_vguide";
    }
@@ -630,11 +634,11 @@ gint  p_gimp_image_get_guide_orientation(gint32 image_id, gint32 guide_id)
                                     
       if (return_vals[0].data.d_status == STATUS_SUCCESS)
       {
-         if(return_vals[1].data.d_int32 != 1)  /* in GIMP 1.1 we could use (orientation != ORIENTATION_HORIZONTAL) */
+         if(return_vals[1].data.d_int32 != ORIENTATION_HORIZONTAL)
          {
-           return(0);
+           return(XJT_ORIENTATION_VERTICAL);
          }
-         return(return_vals[1].data.d_int32);  /* return the guide orientation */
+         return(XJT_ORIENTATION_HORIZONTAL);  /* return the guide orientation */
       }
       printf("XJT: Error: PDB call of %s failed\n", l_get_guide_pos_orient);
    }
@@ -784,3 +788,47 @@ gint32  p_gimp_channel_get_tattoo (gint32 channel_id)
    }
    return(0);
 }	/* end p_gimp_channel_get_tattoo */
+
+/* ============================================================================
+ * p_gimp_parasite_list
+ *
+ * ============================================================================
+ */
+
+char **
+p_gimp_parasite_list (gint32 *num_parasites)
+{
+   static char     *l_procname = "gimp_parasite_list";
+   GParam          *return_vals;
+   int              nreturn_vals;
+   int              l_idx;
+   char           **l_array;
+   char           **parasite_names;
+
+   if (p_procedure_available(l_procname) >= 0)
+   {
+      return_vals = gimp_run_procedure (l_procname,
+                                    &nreturn_vals,
+                                    PARAM_END);
+                                    
+      if (return_vals[0].data.d_status == STATUS_SUCCESS)
+      {
+         *num_parasites = return_vals[1].data.d_int32;
+	 l_array = (char **) return_vals[2].data.d_stringarray;
+	 parasite_names = g_malloc(sizeof(char *) * *num_parasites);
+	 for(l_idx = 0; l_idx < *num_parasites; l_idx++)
+	 {
+	    parasite_names[l_idx] = g_strdup(l_array[l_idx]);
+	    printf("parasite_list: NAME:%s:\n", parasite_names[l_idx]);
+	 }
+         return(parasite_names);  /* OK */
+      }
+      printf("XJT: Error: PDB call of %s failed\n", l_procname);
+   }
+   else
+   {
+      printf("XJT: Warning: Procedure %s not found.\n",  l_procname);
+   }
+   *num_parasites = 0;
+   return(NULL);
+}	/* end p_gimp_parasite_list */

plug-ins/xjt/xpdb_calls.h

@@ -20,6 +20,7 @@
  */
 
 /* revision history:
+ * version 1.1.15;  2000/01/20  hof: parasites
  * version 1.02.00; 1999/02/01  hof: PDB-calls to load/save resolution tattoos and parasites
  *                                   (needs GIMP 1.1.1)-- UNDER CONSTRUCTION ---
  * version 1.01.00; 1998/11/22  hof: PDB-calls to load/save guides under GIMP 1.1
@@ -55,6 +56,6 @@ gint   p_gimp_image_set_resolution(gint32 image_id, float xresolution, float yre
 gint32 p_gimp_layer_get_tattoo(gint32 layer_id);
 gint32 p_gimp_channel_get_tattoo(gint32 channel_id);
 
-Parasite  *gimp_image_parasite_find(gint32 image_id, const char *name);
+char** p_gimp_parasite_list (gint32 *num_parasites);
 
 #endif

po-plug-ins/POTFILES.in

@@ -247,6 +247,7 @@ plug-ins/struc/struc.c
 plug-ins/twain/twain.c
 plug-ins/webbrowser/webbrowser.c
 plug-ins/winsnap/winsnap.c
+plug-ins/xjt/xjt.c
 libgimp/gimpcolorbutton.c
 libgimp/gimpexport.c
 libgimp/gimpfileselection.c