Commit: eeaf2ddb3bc5cf2583c19864fcbb6c3566ec0ff3 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: eeaf2ddb3bc5cf2583c19864fcbb6c3566ec0ff3 (tree)
• Time: 2003-10-15 06:51:12
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

pre[67]

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/authors.h
• modified: app/diapsrenderer.c
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia-manual.xml
• modified: doc/pl/dia-manual.sgml
• modified: plug-ins/pstricks/render_pstricks.c
• modified: shapes/Cisco/Makefile.am

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,43 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* doc/pl/dia-manual.sgml: 
+	* doc/en/dia-manual.xml: 
+	* config.h.win32: 
+	* NEWS: 
+	* configure.in: 
+	* dia.spec (Release): Pre7.
+
+	* app/diapsrenderer.c (draw_string): Convert string to print based
+	on current locale.  If conversion fails, fall back to UTF-8 (which
+	is almost certain to be messy).
+
[phone]  Lars Clausen  <[e-mail]>
+
+	* doc/pl/dia-manual.sgml: 
+	* dia.spec (Release): 
+	* configure.in: 
+	* NEWS: 
+	* config.h.win32: 
+	* doc/en/dia-manual.xml: Pre6.
+
+	* plug-ins/pstricks/render_pstricks.c (draw_string): Don't escape
+	TeX chars in strings -- must be possible to use TeX text in there.
+	Also avoids infinite loop bug (#124464) Will get option for this
+	later.
+
 2003-10-11  Lars Clausen  <[e-mail]>
 
+	* shapes/Cisco/Makefile.am: Cisco shapes now install correctly.
+
+	* doc/en/dia-manual.xml: 
+	* doc/pl/dia-manual.sgml: 
+	* dia.spec (Release): 
+	* configure.in: 
+	* config.h.win32: 
+	* NEWS: pre5.
+
+	* app/authors.h: Removed duplicate of M. C. Nelson.
+
 	* plug-ins/pixbuf/pixbuf.c: Unique name for pixbuf export: gdkpixbuf.
 
 	* app/export_png.c: Unique name for libart PNG export: png-libart.

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+dia-0.92-pre7: 14-Oct-2003
+
+* EPS output with built-in fonts now does locale conversion.  The PS still
+  thinks it's Latin-1.
+
+dia-0.92-pre6: 11-Oct-2003
+
+* Cisco sheets install fix.
+
+dia-0.92-pre5: 11-Oct-2003
+
+* Allow choosing the export format explicitly when in doubt.
+
 dia-0.92-pre4: 27-Sep-2003
 
 * Use Win32 PS font EPS rendering on Unix as well, to allow the various

--- a/app/authors.h
+++ b/app/authors.h
@@ -74,7 +74,6 @@ static const gchar *authors[] =	{
     "Fredrik Hallenberg <[e-mail]>",   
     "Francis J. Lacoste <[e-mail]>",
     "Steffen Macke <[e-mail]>",
-    "M. C. Nelson <[e-mail]>",
     "Jacek Pliszka <[e-mail]>",
     "Henk Jan Priester <[e-mail]>",
     "Alejandro Aguilar Sierra <[e-mail]>",

--- a/app/diapsrenderer.c
+++ b/app/diapsrenderer.c
@@ -500,6 +500,8 @@ draw_string(DiaRenderer *self,
   char *buffer;
   const char *str;
   int len;
+  gchar *localestr;
+  GError * error = NULL;
 
   if (1 > strlen(text))
     return;
@@ -508,10 +510,17 @@ draw_string(DiaRenderer *self,
 
   /* TODO: Use latin-1 encoding */
 
+  localestr = g_locale_from_utf8(text, -1, NULL, NULL, &error);
+
+  if (localestr == NULL) {
+    message_error("Can't convert string %s: %s\n", text, error->message);
+    localestr = g_strdup(text);
+  }
+
   /* Escape all '(' and ')':  */
-  buffer = g_malloc(2*strlen(text)+1);
+  buffer = g_malloc(2*strlen(localestr)+1);
   *buffer = 0;
-  str = text;
+  str = localestr;
   while (*str != 0) {
     len = strcspn(str,"()\\");
     strncat(buffer, str, len);
@@ -524,7 +533,8 @@ draw_string(DiaRenderer *self,
   }
   fprintf(renderer->file, "(%s) ", buffer);
   g_free(buffer);
-  
+  g_free(localestr);
+
   switch (alignment) {
   case ALIGN_LEFT:
     fprintf(renderer->file, "%f %f m", pos->x, pos->y);

--- a/config.h.win32
+++ b/config.h.win32
@@ -14,7 +14,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.92-pre4"
+#define VERSION "0.92-pre7"
 
 /*
  * 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.92-pre4, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.92-pre7, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 

--- a/dia.spec
+++ b/dia.spec
@@ -4,7 +4,7 @@
 Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
-Release: pre4
+Release: pre7
 Copyright: GPL
 Group: Applications/
 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz

--- a/doc/en/dia-manual.xml
+++ b/doc/en/dia-manual.xml
@@ -9,7 +9,7 @@
     <!ENTITY % entities SYSTEM "entities.xml">
     %entities;
     
-    <!ENTITY VERSION "0.92-pre4">
+    <!ENTITY VERSION "0.92-pre7">
     <!ENTITY INTRODUCTION SYSTEM "intro.xml">
     <!ENTITY QUICKSTART SYSTEM "usage-quickstart.xml">
     <!ENTITY CANVAS SYSTEM "usage-canvas.xml">

--- a/doc/pl/dia-manual.sgml
+++ b/doc/pl/dia-manual.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[
-<!ENTITY VERSION "0.92-pre4">
+<!ENTITY VERSION "0.92-pre7">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -638,7 +638,10 @@ fill_bezier(DiaRenderer *self,
 }
 
 /* Do I really want to do this?  What if the text is intended as 
- * TeX text?
+ * TeX text?  Jacek says leave it as a TeX string.  TeX uses should know
+ * how to escape stuff anyway.  Later versions will get an export option.
+ *
+ * Besides, it seems to be broken.
  */
 static gchar *
 tex_escape_string(gchar *src)
@@ -682,7 +685,7 @@ draw_string(DiaRenderer *self,
 	    Color *color)
 {
     PstricksRenderer *renderer = PSTRICKS_RENDERER(self);
-    gchar *escaped = tex_escape_string(text);
+    /*    gchar *escaped = tex_escape_string(text);*/
 
     set_line_color(renderer,color);
 
@@ -697,8 +700,8 @@ draw_string(DiaRenderer *self,
 	fprintf(renderer->file,"[r]");
 	break;
     }
-    fprintf(renderer->file,"(%f,%f){\\scalebox{1 -1}{%s}}\n",pos->x, pos->y,escaped);
-    g_free(escaped);
+    fprintf(renderer->file,"(%f,%f){\\scalebox{1 -1}{%s}}\n",pos->x, pos->y, text);
+    /*    g_free(escaped);*/
 }
 
 static void

--- a/shapes/Cisco/Makefile.am
+++ b/shapes/Cisco/Makefile.am
@@ -1,8 +1,8 @@
 
-  shapedir = $(pkgdatadir)/shapes
- 
-  ciscodir = $(shapedir)/Cisco
-  SHAPES = \
+shapedir = $(pkgdatadir)/shapes
+
+ciscodir = $(shapedir)/Cisco
+SHAPES = \
   1000.shape\
   1000.png\
   100baset_hub.shape\
@@ -445,8 +445,7 @@
   workstation.png\
   www_server.shape\
   www_server.png
-  
-  
-  EXTRA_DIST = $(SHAPES)
-  
-  cisco_DATA = $(SHAPES)
+
+EXTRA_DIST = $(SHAPES)
+
+cisco_DATA = $(SHAPES)