Index: org/freehep/util/DoubleWithError.java
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/org/freehep/util/DoubleWithError.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- org/freehep/util/DoubleWithError.java	31 May 2004 05:08:49 -0000	1.1.1.1
+++ org/freehep/util/DoubleWithError.java	31 May 2004 11:34:09 -0000	1.2
@@ -8,7 +8,7 @@
  *
  * @author Tony Johnson
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class DoubleWithError
 {
@@ -80,7 +80,7 @@
 		}
 	}
 
-	public final static String plusorminus = "ｱ";
+	public final static String plusorminus = "\u00b1";
 	public final static String plus = "+";
 	public final static String minus = "-";
 	private double value;
Index: tools/ant.bat
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/tools/ant.bat,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- tools/ant.bat	31 May 2004 05:08:48 -0000	1.1.1.1
+++ tools/ant.bat	10 Jul 2004 20:46:40 -0000	1.2
@@ -1,3 +1,4 @@
 @SETLOCAL
-@SET ANT_HOME=%FREEHEP%\tools
-@java -cp "%FREEHEP%\tools\freehep-buildtools.jar;%FREEHEP%\tools\junit.jar;%ANT_HOME%\ant.jar;%ANT_HOME%\ant-optional.jar;%JDK_HOME%\lib\tools.jar" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %*
+@SET ANT_HOME=%FREEHEP%\..\..\tools
+@SET TOOLS_PATH=%FREEHEP%\..\..\tools
+@java -cp "%FREEHEP%\tools\freehep-buildtools.jar;%TOOLS_PATH%\junit.jar;%ANT_HOME%\ant.jar;%ANT_HOME%\ant-optional.jar;%JDK_HOME%\lib\tools.jar" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %*
Index: org/freehep/graphicsio/svg/SVGGraphics2D.java
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/svg/SVGGraphics2D.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- org/freehep/graphicsio/svg/SVGGraphics2D.java	31 May 2004 05:08:51 -0000	1.1.1.1
+++ org/freehep/graphicsio/svg/SVGGraphics2D.java	26 Jul 2004 05:39:53 -0000	1.2
@@ -32,7 +32,7 @@
  * but can generate also files for the older specs CR-SVG-20000802, WD-SVG-20000303
  *
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class SVGGraphics2D
     extends AbstractVectorGraphicsIO {
@@ -87,7 +87,7 @@
         defaultProperties.setProperties(newProperties);
     }
 
-    public static final String version = "$Revision: 1.11 $";
+    public static final String version = "$Revision: 1.11 $";
 
     // shift to make draw routines draw in the middle
     private static final double bias = 0.5;
@@ -244,12 +244,12 @@
         os.println("<Creator>"+XMLWriter.normalizeText(getCreator())+"</Creator>");
         os.println("<Producer>"+XMLWriter.normalizeText(producer)+"</Producer>");
         os.println("<Source>"+XMLWriter.normalizeText(getProperty(FOR))+"</Source>");
-        if (!isDeviceIndependent()) {
-            os.println("<Date>"+
-                          DateFormat.
-                          getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).
-                          format(new Date())+"</Date>");
-        }
+//        if (!isDeviceIndependent()) {
+//            os.println("<Date>"+
+//                          DateFormat.
+//                          getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).
+//                          format(new Date())+"</Date>");
+//        }
         os.println("</desc>");
 
         writeDefs();
Index: org/freehep/graphicsio/PageConstants.java
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/PageConstants.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- PageConstants.java	31 May 2004 05:08:51 -0000	1.1.1.1
+++ PageConstants.java	26 Jul 2004 06:48:40 -0000	1.2
@@ -13,7 +13,7 @@
  *
  * @author Charles Loomis
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class PageConstants {
 
@@ -86,13 +86,15 @@
     // Margins
     public static final String PAGE_MARGINS     = "PageMargins";
 
+	public static final String NO_MARGIN        = "No Margin";
     public static final String SMALL            = "Small";
     public static final String MEDIUM           = "Medium";
     public static final String LARGE            = "Large";
 
     private static final Map marginTable = new HashMap();
     static {
-        marginTable.put(SMALL,            new Insets(20, 20, 20, 20));
+        marginTable.put(NO_MARGIN,        new Insets(0, 0, 0, 0));
+		marginTable.put(SMALL,            new Insets(20, 20, 20, 20));
         marginTable.put(MEDIUM,           new Insets(30, 30, 30, 30));
         marginTable.put(LARGE,            new Insets(40, 40, 40, 40));
     }
Index: org/freehep/graphicsio/pdf/PDFGraphics2D.java
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/pdf/PDFGraphics2D.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- PDFGraphics2D.java	31 May 2004 05:08:52 -0000	1.1.1.1
+++ PDFGraphics2D.java	26 Jul 2004 06:50:26 -0000	1.2
@@ -34,7 +34,7 @@
  *
  * @author Simon Fischer
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class PDFGraphics2D
     extends AbstractVectorGraphicsIO
@@ -106,10 +106,11 @@
 
         defaultProperties.setProperty(VERSION,          VERSION5);
         defaultProperties.setProperty(COMPRESS,         true);
-        defaultProperties.setProperty(PAGE_SIZE,        PageConstants.INTERNATIONAL);
-        defaultProperties.setProperty(PAGE_MARGINS,     PageConstants.getMargins(PageConstants.SMALL));
+        defaultProperties.setProperty(PAGE_SIZE,        PageConstants.A4);
+		defaultProperties.setProperty(PAGE_MARGINS,     PageConstants.getMargins(PageConstants.NO_MARGIN));
+//        defaultProperties.setProperty(PAGE_MARGINS,     PageConstants.getMargins(PageConstants.SMALL));
         defaultProperties.setProperty(ORIENTATION,      PageConstants.PORTRAIT);
-        defaultProperties.setProperty(FIT_TO_PAGE,      true);
+        defaultProperties.setProperty(FIT_TO_PAGE,      false);
         defaultProperties.setProperty(EMBED_FONTS,      false);
         defaultProperties.setProperty(EMBED_FONTS_AS,   FontConstants.EMBED_FONTS_TYPE3);
         defaultProperties.setProperty(THUMBNAILS,       defaultProperties.getProperty(VERSION).equals(VERSION4));
@@ -130,7 +131,7 @@
         defaultProperties.setProperties(newProperties);
     }
 
-    public static final String version = "$Revision: 1.11 $";
+    public static final String version = "$Revision: 1.11 $";
 
     private static final String PDF_VERSION = "1.4";
 
Index: org/freehep/graphicsio/ps/PSGraphics2D.java
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/ps/PSGraphics2D.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- PSGraphics2D.java	31 May 2004 05:08:52 -0000	1.1.1.1
+++ PSGraphics2D.java	26 Jul 2004 06:52:17 -0000	1.2
@@ -34,7 +34,7 @@
 /**
  * @author Charles Loomis
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class PSGraphics2D
     extends AbstractVectorGraphicsIO
@@ -65,10 +65,11 @@
         defaultProperties.setProperty(BACKGROUND,       false);
         defaultProperties.setProperty(BACKGROUND_COLOR, Color.GRAY);
 
-        defaultProperties.setProperty(PAGE_SIZE,        PageConstants.INTERNATIONAL);
-        defaultProperties.setProperty(PAGE_MARGINS,     PageConstants.getMargins(PageConstants.SMALL));
-        defaultProperties.setProperty(ORIENTATION,      PageConstants.LANDSCAPE);
-        defaultProperties.setProperty(FIT_TO_PAGE,      true);
+        defaultProperties.setProperty(PAGE_SIZE,        PageConstants.A4);
+		defaultProperties.setProperty(PAGE_MARGINS,     PageConstants.getMargins(PageConstants.NO_MARGIN));
+//        defaultProperties.setProperty(PAGE_MARGINS,     PageConstants.getMargins(PageConstants.SMALL));
+        defaultProperties.setProperty(ORIENTATION,      PageConstants.PORTRAIT);
+        defaultProperties.setProperty(FIT_TO_PAGE,      false);
         defaultProperties.setProperty(EMBED_FONTS,      false);
         defaultProperties.setProperty(EMBED_FONTS_AS,   FontConstants.EMBED_FONTS_TYPE3);
 
@@ -85,7 +86,7 @@
         return defaultProperties;
     }
 
-    public static final String version = "$Revision: 1.11 $";
+    public static final String version = "$Revision: 1.11 $";
 
     public static final int LEVEL_2 = 2;
     public static final int LEVEL_3 = 3;
Index: org/freehep/graphicsio/exportchooser/PageMarginPanel.java
===================================================================
RCS file: /cvsroot/samurai-graph/samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/exportchooser/PageMarginPanel.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- PageMarginPanel.java	31 May 2004 05:08:53 -0000	1.1.1.1
+++ PageMarginPanel.java	26 Jul 2004 06:56:39 -0000	1.2
@@ -17,12 +17,13 @@
 /**
  *
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class PageMarginPanel extends OptionPanel {
 
     final private static String pageMarginList[] = {
         "Custom",
+		PageConstants.NO_MARGIN,
         PageConstants.SMALL,
         PageConstants.MEDIUM,
         PageConstants.LARGE
Index: samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/exportchooser/BackgroundPanel.java
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/exportchooser/BackgroundPanel.java:1.1.1.1 samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/exportchooser/BackgroundPanel.java:1.2
--- samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/exportchooser/BackgroundPanel.java:1.1.1.1	Mon May 31 14:08:53 2004
+++ samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/exportchooser/BackgroundPanel.java	Thu Feb 10 20:02:34 2005
@@ -17,7 +17,7 @@
 /**
  *
  * @author Mark Donszelmann
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class BackgroundPanel extends OptionPanel {
 
@@ -44,6 +44,10 @@
         OptionCheckBox backgroundCheck = new OptionCheckBox(options, rootKey+"."+PageConstants.BACKGROUND, "Background");
 
         colorChooser = new JColorChooser(initialBackground);
+
+		// replace the preview panel with a new panel
+        colorChooser.setPreviewPanel( new JPanel() );
+
         JDialog dialog = JColorChooser.createDialog(
                                 this, "Choose Background Color",
                                 true, colorChooser, new ChangeColorListener(), null);
Index: samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.1.1.1 samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.2
--- samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.1.1.1	Mon May 31 14:08:49 2004
+++ samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java	Mon Feb 14 15:32:28 2005
@@ -14,7 +14,7 @@
  * An "Export" dialog for saving components as graphic files.
  *
  * @author tonyj
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class ExportDialog extends JOptionPane
 {
@@ -136,7 +136,7 @@
             baseDir = new File(saveFile).getParent();
             defFile = saveFile;
          } else {
-            defFile = baseDir+File.separator+defFile;
+//            defFile = baseDir+File.separator+defFile;
          }
          File f = new File(defFile);
          if (currentType() != null) f = currentType().adjustFilename(f, props);
Index: samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.2 samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.3
--- samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.2	Mon Feb 14 15:32:28 2005
+++ samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java	Mon Feb 14 16:56:30 2005
@@ -14,7 +14,7 @@
  * An "Export" dialog for saving components as graphic files.
  *
  * @author tonyj
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class ExportDialog extends JOptionPane
 {
@@ -32,6 +32,27 @@
    {
       props = properties;
    }
+
+	/**
+	 * Set the Properties object.
+	 * @param key
+	 * @param value
+	 * @return
+	 */
+	public Object setUserProperty( String key, String value )
+	{
+		return props.setProperty( key, value );
+	}
+
+	/**
+	 * Rerurns the properties for user preferences.
+	 * @return The Properties to use for user preferences
+	 */
+	public Properties getUserProperties()
+	{
+		return props;
+	}
+
    /**
     * Register an export file type.
     */
Index: samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.3 samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.4
--- samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.3	Mon Feb 14 16:56:30 2005
+++ samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java	Mon Feb 21 15:13:56 2005
@@ -14,13 +14,13 @@
  * An "Export" dialog for saving components as graphic files.
  *
  * @author tonyj
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class ExportDialog extends JOptionPane
 {
-    private static final String rootKey = ExportDialog.class.getName();
-    private static final String SAVE_AS_TYPE = rootKey +".SaveAsType";
-    private static final String SAVE_AS_FILE = rootKey +".SaveAsFile";
+    public static final String rootKey = ExportDialog.class.getName();
+	public static final String SAVE_AS_TYPE = rootKey +".SaveAsType";
+	public static final String SAVE_AS_FILE = rootKey +".SaveAsFile";
 
    /**
     * Set the Properties object to be used for storing/restoring
Index: samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/java/services/org.freehep.util.export.ExportFileType
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/java/services/org.freehep.util.export.ExportFileType:1.1.1.1 samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/java/services/org.freehep.util.export.ExportFileType:1.2
--- samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/java/services/org.freehep.util.export.ExportFileType:1.1.1.1	Mon May 31 14:08:52 2004
+++ samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/java/services/org.freehep.util.export.ExportFileType	Tue Feb 22 11:10:28 2005
@@ -1 +0,0 @@
-org.freehep.graphicsio.java.JAVAExportFileType
Index: samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/ppm/services/org.freehep.util.export.ExportFileType
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/ppm/services/org.freehep.util.export.ExportFileType:1.1.1.1 samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/ppm/services/org.freehep.util.export.ExportFileType:1.2
--- samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/ppm/services/org.freehep.util.export.ExportFileType:1.1.1.1	Mon May 31 14:08:52 2004
+++ samurai-graph/contrib/vectorgraphics/org/freehep/graphicsio/ppm/services/org.freehep.util.export.ExportFileType	Tue Feb 22 11:21:42 2005
@@ -1 +0,0 @@
-org.freehep.graphicsio.ppm.PPMExportFileType
Index: samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java
diff -u samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.4 samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.5
--- samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java:1.4	Mon Feb 21 15:13:56 2005
+++ samurai-graph/contrib/vectorgraphics/org/freehep/util/export/ExportDialog.java	Tue Feb 22 11:45:49 2005
@@ -14,11 +14,11 @@
  * An "Export" dialog for saving components as graphic files.
  *
  * @author tonyj
- * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
+ * @version $Id: SAMURAIGRAPH-ChangeLog.txt,v 1.11 2005/02/22 02:51:18 kuromaru Exp $
  */
 public class ExportDialog extends JOptionPane
 {
-    public static final String rootKey = ExportDialog.class.getName();
+    private static final String rootKey = ExportDialog.class.getName();
 	public static final String SAVE_AS_TYPE = rootKey +".SaveAsType";
 	public static final String SAVE_AS_FILE = rootKey +".SaveAsFile";
