Commit: 5999a091b725a1cd0863f62183b7780e16fda0fa - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 5999a091b725a1cd0863f62183b7780e16fda0fa (tree)
• Time: 2003-09-29 01:19:32
• Author: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Font render thingy.

Change Summary

• modified: ChangeLog
• modified: NEWS
• modified: app/app_procs.c
• modified: app/diapsrenderer.c
• modified: app/render_eps.c
• modified: app/render_eps.h
• modified: config.h.win32
• modified: configure.in
• modified: dia.spec
• modified: doc/en/dia-manual.xml
• modified: doc/pl/dia-manual.sgml
• modified: lib/font.c

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,27 @@
 
 	* makefile.msc: added target po to update the translations
 
[phone]  Lars Clausen  <[e-mail]>
+
+	* config.h.win32: 
+	* dia.spec (Release): 
+	* NEWS: 
+	* doc/pl/dia-manual.sgml: 
+	* doc/en/dia-manual.xml: 
+	Pre4 is given a short try.
+	
+	* configure.in: Give all necessary libs to PNG test.
+
+	* lib/font.c: Added legacy entries for sans, serif and monospace.
+
+	* app/app_procs.c (internal_plugin_init): 
+	* app/render_eps.h: 
+	* app/render_eps.c: 
+	Added PS fonts output for Unix.
+
+	* app/diapsrenderer.c (set_font): Adjusted height by the magic .7
+	factor to make PS fonts stay in boxes.
+	
 2003-08-03  Hans Breuer  <[e-mail]>
 
 	* config.h.win32 : close the version string

--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+dia-0.92-pre4: 27-Sep-2003
+
+* Use Win32 PS font EPS rendering on Unix as well, to allow the various
+  manipulation tools to work.
+* Libart rendering is back on win32.
+* Icon fix.
+
 dia-0.92-pre3: 22-Sep-2003
 
 * Working caching of Pango context removes huge slowdown from pre2.

--- a/app/app_procs.c
+++ b/app/app_procs.c
@@ -667,9 +667,16 @@ internal_plugin_init(PluginInfo *info)
   filter_register_import(&dia_import_filter);
 
   /* register export filters */
+  /* Standard Dia format */
   filter_register_export(&dia_export_filter);
+  /* EPS with PS fonts */
   filter_register_export(&eps_export_filter);
+#ifdef HAVE_FREETYPE
+  /* EPS with Pango rendering */
+  filter_register_export(&eps_ft2_export_filter);
+#endif
 #if defined(HAVE_LIBPNG) && defined(HAVE_LIBART)
+  /* PNG with libart rendering */
   filter_register_export(&png_export_filter);
 #endif
 

--- a/app/diapsrenderer.c
+++ b/app/diapsrenderer.c
@@ -240,7 +240,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height)
   DiaPsRenderer *renderer = DIA_PS_RENDERER(self);
 
   fprintf(renderer->file, "/%s-latin1 ff %f scf sf\n",
-          dia_font_get_psfontname(font), (double)height);
+          dia_font_get_psfontname(font), (double)height*0.7);
 }
 
 static void

--- a/app/render_eps.c
+++ b/app/render_eps.c
@@ -66,18 +66,38 @@
 #include "diapsft2renderer.h"
 #endif
 
+static void export_eps(DiagramData *data, const gchar *filename, 
+		       const gchar *diafilename, void* user_data);
+static void export_render_eps(DiaPsRenderer *renderer, 
+			      DiagramData *data, const gchar *filename, 
+			      const gchar *diafilename, void* user_data);
+
+#ifdef HAVE_FREETYPE
+static void export_ft2_eps(DiagramData *data, const gchar *filename, 
+		    const gchar *diafilename, void* user_data);
+static void
+export_ft2_eps(DiagramData *data, const gchar *filename, 
+	       const gchar *diafilename, void* user_data) {
+  export_render_eps(g_object_new (DIA_TYPE_PS_FT2_RENDERER, NULL),
+		    data, filename, diafilename, user_data);
+}
+#endif
+
 static void
 export_eps(DiagramData *data, const gchar *filename, 
            const gchar *diafilename, void* user_data)
 {
-  DiaPsRenderer *renderer;
+  export_render_eps(g_object_new (DIA_TYPE_PS_RENDERER, NULL),
+		    data, filename, diafilename, user_data);
+}
+
+static void
+export_render_eps(DiaPsRenderer *renderer, 
+		  DiagramData *data, const gchar *filename, 
+		  const gchar *diafilename, void* user_data)
+{
   FILE *outfile;
 
-#ifdef HAVE_FREETYPE
-  renderer = g_object_new (DIA_TYPE_PS_FT2_RENDERER, NULL);
-#else
-  renderer = g_object_new (DIA_TYPE_PS_RENDERER, NULL);
-#endif
   outfile = fopen(filename, "w");
   if (outfile == NULL) {
     message_error(_("Can't open output file %s: %s\n"), filename, strerror(errno));
@@ -114,9 +134,17 @@ new_psprint_renderer(Diagram *dia, FILE *file)
   return DIA_RENDERER(renderer);
 }
 
+#ifdef HAVE_FREETYPE
 static const gchar *extensions[] = { "eps", "epsi", NULL };
+DiaExportFilter eps_ft2_export_filter = {
+  N_("Encapsulated Postscript (using Pango fonts)"),
+  extensions,
+  export_ft2_eps
+};
+#endif
+
 DiaExportFilter eps_export_filter = {
-  N_("Encapsulated Postscript"),
+  N_("Encapsulated Postscript (using builtin PS fonts)"),
   extensions,
   export_eps
 };

--- a/app/render_eps.h
+++ b/app/render_eps.h
@@ -28,6 +28,7 @@ DiaRenderer *new_eps_renderer(Diagram *dia, char *filename);
 DiaRenderer *new_psprint_renderer(Diagram *dia, FILE *file);
 void eps_renderer_prolog_done(DiaRenderer *renderer);
 
+extern DiaExportFilter eps_ft2_export_filter;
 extern DiaExportFilter eps_export_filter;
 
 #endif /* RENDER_EPS_H */

--- a/config.h.win32
+++ b/config.h.win32
@@ -14,7 +14,7 @@
 #define GETTEXT_PACKAGE "dia"
 #define LOCALEDIR "../lib/locale"
 
-#define VERSION "0.92-pre3"
+#define VERSION "0.92-pre4"
 
 /*
  * 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-pre3, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
+AC_INIT(dia, 0.92-pre4, http://bugzilla.gnome.org/enter_bug.cgi?product=dia)
 AC_CONFIG_SRCDIR(app/diagram.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
@@ -162,7 +162,7 @@ dnl this likely already comes from GTK
 dnl Something in here pollutes $LIBS with -lpng.  Make sure to
 dnl avoid that.
 
-old_LIBS="$LIBS"
+old_LIBS="${LIBS}"
 
 png_ok=no
 AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)
@@ -170,7 +170,8 @@ AC_CHECK_LIB(png, png_read_info, ,png_ok=no, -lz -lm)
 if test "$png_ok" = yes; then
   AC_MSG_CHECKING([for png_structp in png.h])
   dnl Why can't AC_LINK_IFELSE take extra libs?
-  LIBS="${LIBS} -lz -lm"
+  old_LDFLAGS="${LDFLAGS}"
+  LDFLAGS="${LDFLAGS} -lz -lm"
   AC_LINK_IFELSE([#include <png.h>
                   png_structp pp;
 		  png_infop info; 
@@ -178,6 +179,7 @@ if test "$png_ok" = yes; then
 		  main() { void*foo = png_create_read_struct; }],
                  png_ok=yes,
                  png_ok=no)
+  LDFLAGS="${old_LDFLAGS}"
   AC_MSG_RESULT($png_ok)
   if test "$png_ok" = yes; then
     PNG_LIBS='-lpng -lz -lm'

--- a/dia.spec
+++ b/dia.spec
@@ -4,7 +4,7 @@
 Summary: A gtk+ based diagram creation program.
 Name: %name
 Version: %ver
-Release: pre3
+Release: pre4
 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-pre3">
+    <!ENTITY VERSION "0.92-pre4">
     <!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-pre3">
+<!ENTITY VERSION "0.92-pre4">
 <!ENTITY INTRODUCTION SYSTEM "intro.sgml">
 <!ENTITY QUICKSTART SYSTEM "usage-quickstart.sgml">
 <!ENTITY CANVAS SYSTEM "usage-canvas.sgml">

--- a/lib/font.c
+++ b/lib/font.c
@@ -700,6 +700,7 @@ static struct _legacy_font {
   { "Bookman-Light",       "Bookman Old Style", DIA_FONT_SERIF | DIA_FONT_LIGHT },
   { "Bookman-LightItalic", "Bookman Old Style", DIA_FONT_SERIF | DIA_FONT_LIGHT | DIA_FONT_ITALIC },
   { "BousungEG-Light-GB", "BousungEG-Light-GB", DIA_FONT_FAMILY_ANY },
+  { "Courier",             "monospace", DIA_FONT_MONOSPACE },
   { "Courier",             "Courier New", DIA_FONT_MONOSPACE },
   { "Courier-Bold",        "Courier New", DIA_FONT_MONOSPACE | DIA_FONT_BOLD },
   { "Courier-BoldOblique", "Courier New", DIA_FONT_MONOSPACE | DIA_FONT_OBLIQUE | DIA_FONT_BOLD },
@@ -709,6 +710,7 @@ static struct _legacy_font {
   { "GothicBBB-Medium", "GothicBBB-Medium", DIA_FONT_FAMILY_ANY },
   { "Gulim", "Gulim", DIA_FONT_FAMILY_ANY }, 
   { "Headline", "Headline", DIA_FONT_FAMILY_ANY },
+  { "Helvetica",             "sans", DIA_FONT_SANS },
   { "Helvetica",             "Arial", DIA_FONT_SANS },
   { "Helvetica-Bold",        "Arial", DIA_FONT_SANS | DIA_FONT_BOLD },
   { "Helvetica-BoldOblique", "Arial", DIA_FONT_SANS | DIA_FONT_BOLD | DIA_FONT_OBLIQUE },
@@ -733,6 +735,7 @@ static struct _legacy_font {
   { "Times-Bold",       "Times New Roman", DIA_FONT_SERIF | DIA_FONT_BOLD },
   { "Times-BoldItalic", "Times New Roman", DIA_FONT_SERIF | DIA_FONT_ITALIC | DIA_FONT_BOLD },
   { "Times-Italic",     "Times New Roman", DIA_FONT_SERIF | DIA_FONT_ITALIC },
+  { "Times-Roman",      "serif", DIA_FONT_SERIF }, 
   { "Times-Roman",      "Times New Roman", DIA_FONT_SERIF }, 
   { "ZapfChancery-MediumItalic", "Zapf Calligraphic 801 SWA", DIA_FONT_SERIF | DIA_FONT_MEDIUM },
   { "ZapfDingbats", "Zapf Calligraphic 801 SWA", DIA_FONT_SERIF },