Commit: d91dbf3ca984722463db8d5e27bcef08a584b991 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: d91dbf3ca984722463db8d5e27bcef08a584b991 (tree)
• Time: 2004-05-26 16:09:34
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Fix shape bug, help bug, and man page generation bug.

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/Makefile.am
• modified: app/app_procs.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/Makefile.am
• modified: doc/en/dia.1
• modified: doc/en/dia.xml
• modified: doc/pl/Makefile.am
• modified: doc/pl/dia.xml
• modified: objects/custom/custom_object.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* config.h.win32: 
+	* NEWS: 
+	* configure.in: 
+	* dia.spec (Release): 
+	* doc/pl/dia.xml: 
+	* doc/en/dia.xml: 
+	Brown-bag release 0.93.1
+
+	* app/Makefile.am (run_dia.sh$(EXEEXT)): Use $@ instead of $* to
+	allow more than one argument along with arguments with spaces.
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/app_procs.c (app_init): Make --help and other options work
+	without popt installed.
+
+	* doc/pl/Makefile.am (EXTRA_DIST): Distribute all the xml pages.
+
+	* doc/en/Makefile.am (dia.1): Make the manpages automagically.
+	Also distribute all of the xml pages.
+
+	* configure.in (DB2MAN): Check for docbook.xsl in several
+	different places where itøs been known to appear, in lieu of a
+	proper way to ask for its presence.
+
+	* objects/custom/custom_object.c (custom_load_using_properties):
+	Up the version and handle reading old version diagrams.  Now uses
+	correct names for the standard properties.
+
 2004-05-17  Hans Breuer  <[e-mail]>
 
 	* lib/object_defaults.c : don't 'failed to load external 

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+dia-0.93.1: 25-May-2004
+
+Brown bag release due to shapes properties bug.  Also fixes problems
+with options when no popt is present, and distribution of docs.
+
+dia-0.93: 29-Apr-2004
+
+Ready for release.
+
 dia-0.93-pre2: 04-Apr-2004
 
 Fixed crash bug in ellipse, plus various compilation problems.  Also

--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -244,9 +244,9 @@ run_dia.sh$(EXEEXT): Makefile.am
 	echo "    echo \"please run \$$0 once without a debugger.\"" >> run_dia.sh
 	echo "    exit 1" >> run_dia.sh
 	echo "  fi" >> run_dia.sh
-	echo "   \$$DEBUGGER \"\$$DIA_LIBS_PATH/lt-dia\" \"\$$*\"" >> run_dia.sh
+	echo "   \$$DEBUGGER \"\$$DIA_LIBS_PATH/lt-dia\" \"\$$@\"" >> run_dia.sh
 	echo "else" >> run_dia.sh
-	echo "   \"\$$DIA_APP_PATH/dia\" \"\$$*\"" >> run_dia.sh
+	echo "   \"\$$DIA_APP_PATH/dia\" \"\$$@\"" >> run_dia.sh
 	echo "fi" >> run_dia.sh
 	chmod a+x run_dia.sh
 

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -102,6 +102,9 @@ static PluginInitResult internal_plugin_init(PluginInfo *info);
 static void process_opts(int argc, char **argv,
 #ifdef HAVE_POPT
 			 poptContext poptCtx, struct poptOption options[],
+#else
+			 gboolean *nosplash, gboolean *credits,
+			 gboolean *version, gboolean *logtostderr,
 #endif
 			 GSList **files, char **export_file_name,
 			 char **export_file_format, char **size);
@@ -428,6 +431,9 @@ app_init (int argc, char **argv)
   process_opts(argc, argv, 
 #ifdef HAVE_POPT
                poptCtx, options, 
+#else
+	       &nosplash, &credits,
+	       &version, &log_to_stderr,
 #endif
                &files,
 	     &export_file_name, &export_file_format, &size);
@@ -737,6 +743,9 @@ static void
 process_opts(int argc, char **argv,
 #ifdef HAVE_POPT
 	     poptContext poptCtx, struct poptOption options[],
+#else
+	     gboolean *nosplash, gboolean *credits,
+	     gboolean *version, gboolean *logtostderr,
 #endif
 	     GSList **files, char **export_file_name,
 	     char **export_file_format, char **size)
@@ -774,26 +783,69 @@ process_opts(int argc, char **argv,
 
       for (i=1; i<argc; i++) {
           char *in_file_name = argv[i]; /* unless it's an option... */
-          
+          printf("Arg %i: `%s'\n", i, argv[i]);
           if (0==strcmp(argv[i],"-t")) {
               if (i < (argc-1)) {
                   i++;
                   *export_file_format = argv[i];
                   continue;
               }
+          } else if (0==strncmp(argv[i],"--export-to-format=",19)) {
+	    *export_file_format = &argv[i][19];
+	    continue;
           } else if (0 == strcmp(argv[i],"-e")) {
               if (i < (argc-1)) {
                   i++;
                   *export_file_name = argv[i];
                   continue;
               }
+          } else if (0==strncmp(argv[i],"--export=", 9)) {
+	    *export_file_name = &argv[i][9];
+	    continue;
           } else if (0 == strcmp(argv[i],"-s")) {
               if (i < (argc-1)) {
                   i++;
                   *size = argv[i];
                   continue;
               }
-          }
+          } else if (0==strncmp(argv[i],"--size=",7)) {
+	    *size = &argv[i][7];
+	    continue;
+          } else if (0 == strcmp(argv[i],"-n") ||
+		     0 == strcmp(argv[i],"--nosplash")) {
+	    *nosplash = TRUE;
+	    continue;
+          } else if (0 == strcmp(argv[i],"-l") ||
+		     0 == strcmp(argv[i],"--log-to-stderr")) {
+	    *logtostderr = TRUE;
+	    continue;
+          } else if (0 == strcmp(argv[i],"-c") ||
+		     0 == strcmp(argv[i],"--credits")) {
+	    *credits = TRUE;
+	    continue;
+          } else if (0 == strcmp(argv[i],"-v") ||
+		     0 == strcmp(argv[i],"--version")) {
+	    *version = TRUE;
+	    continue;
+          } else if (0 == strcmp(argv[i],"-h") ||
+		     0==strcmp(argv[i],"--help")) {
+	    /* Taken by running dia --help with popt enabled */
+	    printf("Usage: dia [OPTION...] [FILE...]
+  -e, --export=OUTPUT               Export loaded file and exit
+  -t, --export-to-format=FORMAT     Export to file format and exit.  Supported
+                                    formats are: cgm, dia, dxf, eps,
+                                    eps-pango, fig, mp, plt, hpgl, png, shape,
+                                    svg, tex, wpg
+  -s, --size=WxH                    Export graphics size
+  -n, --nosplash                    Don't show the splash screen
+  -l, --log-to-stderr               Send error messages to stderr instead of
+                                    showing dialogs.
+  -c, --credits                     Display credits list and exit
+  -v, --version                     Display version and exit
+  -h, --help                        Show this help message
+");
+	    exit(0);
+	  }
 	  *files = g_slist_append(*files, in_file_name);
       }
 #endif

--- a/config.h.win32
+++ b/config.h.win32
@@ -15,7 +15,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.93-pre2"
+#define VERSION "0.93.1"
 
 /*
  * We are linking libxml as DLL with either msvc or mingw, but this

--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this -*- autoconf -*- file with autoconf to produce a 
 dnl configure script.
-AC_INIT(dia, 0.93-pre2, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.93.1, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
@@ -148,10 +148,10 @@ dnl
 dnl Popt
 dnl
 
-AC_CHECK_LIB(popt, poptSetOtherOptionHelp, [
+AC_CHECK_LIB(popt, potSetOtherOptionHelp, [
                 AC_DEFINE(HAVE_LIBPOPT,,[popt library available])
 		   POPT_LIBS="-lpopt"])
-AC_CHECK_HEADERS(popt.h)
+AC_CHECK_HEADERS(pot.h)
 AC_SUBST(POPT_LIBS)
 APP_LIBS="$APP_LIBS $POPT_LIBS"
 
@@ -369,6 +369,20 @@ AC_PATH_PROG(DB2HTML, db2html, no)
 AM_CONDITIONAL(HAVE_DB2HTML, 
                test "x$enable_db2html" != xno && test "x$DB2HTML" != xno)
 
+dnl Only enable man page generation if we have db2man
+
+AC_SUBST(DB2MAN)
+dnl Have to have the nwalsh docbook.xsl, which does manpages.
+dnl RedHat installs it in a version-numbered place.  Grumpf.
+db2man_file=
+for file in \
+  /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl \
+  /usr/share/sgml/docbook/xsl-stylesheets-\*/manpages/docbook.xsl; do
+  if test -f $file; then db2man_file=$file; break; fi
+done
+AM_CONDITIONAL(HAVE_DB2MAN, test "x$db2man_file" != x)
+AC_SUBST(DB2MAN, "$db2man_file")
+
 dnl Handling for Python
 AC_ARG_WITH(python,
 [  --with-python           compile python plug-in],,with_python=no)

--- a/dia.spec
+++ b/dia.spec
@@ -1,12 +1,12 @@
 %define name dia
 # This is the full Dia version
-%define ver 0.93
+%define ver 0.93.1
 
 Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
 # This indicates changes to the spec file after last time %ver has changed.
-Release: pre2
+Release: 1
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz

--- a/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
@@ -9,10 +9,30 @@ dist-hook: app-dist-hook
 
 EXTRA_DIST += \
 	dia.1 \
+	dia.dbk \
+	authors.xml \
 	dia.xml \
+	entities.xml \
+	intro.xml \
+	license.xml \
+	usage-canvas.xml \
+	usage-customization.xml \
+	usage-layers.xml \
+	usage-loadsave.xml \
+	usage-objects-basic.xml \
+	usage-objects-selecting.xml \
+	usage-objects-special.xml \
+	usage-objects.xml \
+	usage-quickstart.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/line_icon.png \
 	graphics/greendots.png
 
 man_MANS = dia.1
+
+# Can't have dia.1 automatically created from dia.dbk if we have no DB2MAN
+if HAVE_DB2MAN
+dia.1: dia.dbk
+	xsltproc --nonet --novalid $(DB2MAN) dia.dbk >dia.1
+endif

--- a/doc/en/dia.1
+++ b/doc/en/dia.1
@@ -21,13 +21,12 @@
 .SH NAME
 dia \- a diagram drawing program
 .SH "SYNOPSIS"
-
-.nf
-\fBdia\fR [\fB-c\fR] [\fB--credits\fR] [\fB-e \fIOUTPUT\fR\fR] [\fB--export=\fIOUTPUT\fR\fR]
-    [\fB-h\fR] [\fB--help\fR] [\fB-n\fR] [\fB--nosplash\fR] [\fB-t \fIFORMAT\fR\fR]
-    [\fB--export-to-format=\fIFORMAT\fR\fR] [\fB-v\fR] [\fB--version\fR] [file
-    \&.\&.\&.]
-.fi
+.ad l
+.hy 0
+.HP 4
+\fBdia\fR [\fB\-c\fR] [\fB\-\-credits\fR] [\fB\-e\ \fIOUTPUT\fR\fR] [\fB\-\-export=\fIOUTPUT\fR\fR] [\fB\-h\fR] [\fB\-\-help\fR] [\fB\-n\fR] [\fB\-\-nosplash\fR] [\fB\-s\ \fIWxH\fR\fR] [\fB\-\-size=\fIWxH\fR\fR] [\fB\-t\ \fIFORMAT\fR\fR] [\fB\-\-export\-to\-format=\fIFORMAT\fR\fR] [\fB\-v\fR] [\fB\-\-version\fR] [file\ \&.\&.\&.]
+.ad
+.hy
 
 .SH "DESCRIPTION"
 
@@ -46,27 +45,32 @@ Diagrams drawn in \fBDia\fR can be exported PostScript\&.
 \fBDia\fR accepts the following options:
 
 .TP
-\fB-c\fR \fB--credits\fR
+\fB\-c\fR \fB\-\-credits\fR
 Display credits list and exit\&.
 
 .TP
-\fB-e \fIOUTPUT\fR\fR \fB--export=\fIOUTPUT\fR\fR
+\fB\-e \fIOUTPUT\fR\fR \fB\-\-export=\fIOUTPUT\fR\fR
 Export loaded file to OUTPUT and exit\&.
 
 .TP
-\fB-h\fR \fB--help\fR
+\fB\-h\fR \fB\-\-help\fR
 Display a list of all commandline options\&.
 
 .TP
-\fB-n\fR \fB--nosplash\fR
+\fB\-n\fR \fB\-\-nosplash\fR
 Do not show the splash screen\&.
 
 .TP
-\fB-t \fIFORMAT\fR\fR \fB--export-to-format=\fIFORMAT\fR\fR
+\fB\-s \fIWxH\fR\fR \fB\-\-size=\fIWxH\fR\fR
+Export loaded file in decimal given width and/or height\&. It is allowed to only select width or height\&. E\&.g\&. \fB\-\-size=\fI520x\fR\fR exports an image that is 520 pixels wide, while \fB\-\-size=\fIx900\fR\fR exports an image of 900 pixels height\&.
+This option is currently only implemented for the PNG export filter\&.
+
+.TP
+\fB\-t \fIFORMAT\fR\fR \fB\-\-export\-to\-format=\fIFORMAT\fR\fR
 Export loaded file in FORMAT and exit\&. Format are described below\&.
 
 .TP
-\fB-v\fR \fB--version\fR
+\fB\-v\fR \fB\-\-version\fR
 Display \fBdia\fR version and exit\&.
 
 .SH "EXPORT FORMATS"
@@ -85,9 +89,9 @@ dia (Native dia diagram)
 dxf (Drawing Interchange File)
 .TP
 \(bu
-eps or epsi or eps-builtin or eps-pango (Encapsulated PostScript)
+eps or epsi or eps\-builtin or eps\-pango (Encapsulated PostScript)
 
-The format specifications eps, epsi, and eps-pango all use the font renderer of the Pango library, while eps-builtin uses a dia specific font renderer\&. If you have problems with Pango rendering, e\&.g\&. Unicode, try eps-builtin instead\&.
+The format specifications eps, epsi, and eps\-pango all use the font renderer of the Pango library, while eps\-builtin uses a dia specific font renderer\&. If you have problems with Pango rendering, e\&.g\&. Unicode, try eps\-builtin instead\&.
 .TP
 \(bu
 fig (XFig format)

--- a/doc/en/dia.xml
+++ b/doc/en/dia.xml
@@ -8,7 +8,7 @@
 
   [
 
-    <!ENTITY VERSION "0.93-pre2">
+    <!ENTITY VERSION "0.93.1">
 
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
 

--- a/doc/pl/Makefile.am
+++ b/doc/pl/Makefile.am
@@ -8,7 +8,18 @@ include $(top_srcdir)/xmldocs.make
 dist-hook: app-dist-hook
 
 EXTRA_DIST += \
+	authors.xml \
 	dia.xml \
+	intro.xml \
+	license.xml \
+	usage-canvas.xml \
+	usage-customization.xml \
+	usage-layers.xml \
+	usage-loadsave.xml \
+	usage-objects-selecting.xml \
+	usage-objects-special.xml \
+	usage-objects.xml \
+	usage-quickstart.xml \
 	graphics/line_props.png \
 	graphics/home_network.png \
 	graphics/greendots.png

--- a/doc/pl/dia.xml
+++ b/doc/pl/dia.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../../dtd/docbookx.dtd"[
-<!ENTITY VERSION "0.93-pre2">
+<!ENTITY VERSION "0.93.1">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -138,6 +138,13 @@ static ObjectTypeOps custom_type_ops =
   (ApplyDefaultsFunc) NULL
 };
 
+/* Version history for save file format for custom objects:
+0: Initial version
+1: Changed to use standard names for standard properties
+   (border_width -> line_width, inner_color->fill_colour,
+    border_color -> line_colour, line_style+dashlength -> line_style)
+*/
+
 /* This looks like it could be static, but it can't because we key
    on it to determine if an ObjectType is a custom/SVG shape */
 
@@ -145,7 +152,7 @@ G_MODULE_EXPORT
 ObjectType custom_type =
 {
   "Custom - Generic",  /* name */
-  0,                 /* version */
+  1,                 /* version */
   (char **) custom_xpm, /* pixmap */
 
   &custom_type_ops      /* ops */
@@ -1340,10 +1347,39 @@ custom_load_using_properties(ObjectNode obj_node, int version, const char *filen
   Point startpoint = {0.0,0.0};
   Handle *handle1,*handle2;
   Text *init_text;
-  
+  AttributeNode attr;
+
   obj = custom_type.ops->create(&startpoint, shape_info_get(obj_node), &handle1, &handle2);
   custom = (Custom*)obj;
   object_load_props(obj,obj_node);
+
+  if (version < 1) {
+    /* Version 0 misnamed the standard attributes in the savefile. */
+    custom->border_width = 0.1;
+    attr = object_find_attribute(obj_node, "border_width");
+    if (attr != NULL)
+      custom->border_width =  data_real( attribute_first_data(attr) );
+
+    custom->border_color = color_black;
+    attr = object_find_attribute(obj_node, "border_color");
+    if (attr != NULL)
+      data_color(attribute_first_data(attr), &custom->border_color);
+  
+    custom->inner_color = color_white;
+    attr = object_find_attribute(obj_node, "inner_color");
+    if (attr != NULL)
+      data_color(attribute_first_data(attr), &custom->inner_color);
+  
+    custom->line_style = LINESTYLE_SOLID;
+    attr = object_find_attribute(obj_node, "line_style");
+    if (attr != NULL)
+      custom->line_style =  data_enum( attribute_first_data(attr) );
+
+    custom->dashlength = DEFAULT_LINESTYLE_DASHLEN;
+    attr = object_find_attribute(obj_node, "dashlength");
+    if (attr != NULL)
+      custom->dashlength = data_real(attribute_first_data(attr));
+  }
   
   custom_update_data(custom, ANCHOR_MIDDLE, ANCHOR_MIDDLE);