GraphicsMagick: 2 new changesets
GraphicsMagick Commits <[email protected]> Fri, 13 Sep 2024 14:41:06 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.20926.1726256475.7812.graphicsmagick-commit@lists.sourceforge.net> |
changeset 34fbfa6070a7 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=34fbfa6070a7 summary: Add configure support and type-urw-base35-otf.mgk to support newer Artifex urw-base35-fonts, which now support OpenType fonts changeset c01449a5a8df in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=c01449a5a8df summary: Bump snapshot version diffstat: ChangeLog | 10 + Makefile.in | 15 +- README.txt | 9 +- VisualMagick/installer/inc/version.isx | 4 +- config/Makefile.am | 5 +- config/type-urw-base35-otf.mgk.in | 375 +++++++++++++++++++++++++++++++++ configure | 78 ++++++- configure.ac | 65 +++++- magick/version.h | 4 +- www/ChangeLog.html | 12 + www/INSTALL-unix.html | 37 +++ www/INSTALL-unix.rst | 24 ++ www/README.html | 9 +- 13 files changed, 626 insertions(+), 21 deletions(-) diffs (truncated from 987 to 500 lines): diff -r effa76bf2394 -r c01449a5a8df ChangeLog --- a/ChangeLog Thu Sep 12 10:41:35 2024 -0500 +++ b/ChangeLog Fri Sep 13 14:40:28 2024 -0500 @@ -1,3 +1,13 @@ +2024-09-13 Bob Friesenhahn <[email protected]> + + * config/type-urw-base35-otf.mgk.in: Changes for the newer Artifex + urw-base35-fonts, which now support OpenType fonts, and use long + file names. Specifically configure the location using the + --with-urwbase35otf-font-dir configure option. This is in + response to Debian bug 1019717 "Display of an SVG file broken due + to gsfonts transition", + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1019717. + 2024-09-12 Bob Friesenhahn <[email protected]> * configure.ac: Validate legacy Ghostscript font file in diff -r effa76bf2394 -r c01449a5a8df Makefile.in --- a/Makefile.in Thu Sep 12 10:41:35 2024 -0500 +++ b/Makefile.in Fri Sep 13 14:40:28 2024 -0500 @@ -24,7 +24,7 @@ # # -# Copyright (C) 2004 GraphicsMagick Group +# Copyright (C) 2004-2024 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -245,9 +245,10 @@ PerlMagick/Makefile.PL PerlMagick/PerlMagickCheck.sh \ PerlMagick/t/features.pl config/delegates.mgk \ config/type-ghostscript.mgk config/type-solaris.mgk \ - config/type-windows.mgk config/type.mgk \ - magick/GraphicsMagick-config magick/GraphicsMagick.pc \ - magick/magick_types.h magick/version.h common.shi rungm.sh \ + config/type-urw-base35-otf.mgk config/type-windows.mgk \ + config/type.mgk magick/GraphicsMagick-config \ + magick/GraphicsMagick.pc magick/magick_types.h \ + magick/version.h common.shi rungm.sh \ wand/GraphicsMagickWand-config wand/GraphicsMagickWand.pc CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = utilities/gm$(EXEEXT) @@ -2391,6 +2392,7 @@ $(top_srcdir)/config/test-driver \ $(top_srcdir)/config/type-ghostscript.mgk.in \ $(top_srcdir)/config/type-solaris.mgk.in \ + $(top_srcdir)/config/type-urw-base35-otf.mgk.in \ $(top_srcdir)/config/type-windows.mgk.in \ $(top_srcdir)/config/type.mgk.in \ $(top_srcdir)/magick/GraphicsMagick-config.in \ @@ -2772,6 +2774,7 @@ top_srcdir = @top_srcdir@ top_srcdir_native = @top_srcdir_native@ type_include_files = @type_include_files@ +urwbase35otf_font_dir = @urwbase35otf_font_dir@ windows_font_dir = @windows_font_dir@ # Don't require all the GNU mandated files @@ -2924,6 +2927,7 @@ config/type-ghostscript.mgk \ config/type.mgk \ config/type-solaris.mgk \ + config/type-urw-base35-otf.mgk \ config/type-windows.mgk CONFIG_EXTRA_DIST = \ @@ -2933,6 +2937,7 @@ config/modules.mgk \ config/type-ghostscript.mgk.in \ config/type-solaris.mgk.in \ + config/type-urw-base35-otf.mgk.in \ config/type-windows.mgk.in \ config/type.mgk.in @@ -5103,6 +5108,8 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ config/type-solaris.mgk: $(top_builddir)/config.status $(top_srcdir)/config/type-solaris.mgk.in cd $(top_builddir) && $(SHELL) ./config.status $@ +config/type-urw-base35-otf.mgk: $(top_builddir)/config.status $(top_srcdir)/config/type-urw-base35-otf.mgk.in + cd $(top_builddir) && $(SHELL) ./config.status $@ config/type-windows.mgk: $(top_builddir)/config.status $(top_srcdir)/config/type-windows.mgk.in cd $(top_builddir) && $(SHELL) ./config.status $@ config/type.mgk: $(top_builddir)/config.status $(top_srcdir)/config/type.mgk.in diff -r effa76bf2394 -r c01449a5a8df README.txt --- a/README.txt Thu Sep 12 10:41:35 2024 -0500 +++ b/README.txt Fri Sep 13 14:40:28 2024 -0500 @@ -87,7 +87,7 @@ http://www.agocg.ac.uk/train/cgm/ralcgm.htm to read the Computer Graphics Metafile (CGM) image format. You also - need Ghostscript and Ghostscript Fonts (see below). + need Ghostscript and Ghostscript/URW Fonts (see below). * GraphicsMagick requires 'dcraw' (version 8.95 or later) from @@ -102,7 +102,7 @@ http://mcj.sourceforge.net/ - to read the Fig image format. Ghostscript and Ghostscript Fonts (see + to read the Fig image format. Ghostscript and Ghostscript/URW Fonts (see below) are also required. * GraphicsMagick requires the FreeType software, version 2.0 or above, @@ -110,7 +110,7 @@ http://www.freetype.org/ - to annotate with TrueType and Postscript Type 1 fonts. + to annotate with TrueType, OpenType, and Postscript Type 1 fonts. * GraphicsMagick requires Ghostscript software available from @@ -304,7 +304,8 @@ (16-bit WMF files only, not 32-bit "EMF"). This is the format commonly used for Windows clipart (available on CD at your local computer or technical book store). WMF support requires the FreeType - 2 library in order to render TrueType and Postscript fonts. + 2 library in order to render TrueType, OpenType, and Postscript + fonts. While GraphicsMagick uses the libwmflite (parser) component of the libwmf package which does not depend on any special libraries, the diff -r effa76bf2394 -r c01449a5a8df VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Thu Sep 12 10:41:35 2024 -0500 +++ b/VisualMagick/installer/inc/version.isx Fri Sep 13 14:40:28 2024 -0500 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020240912" -#define public MagickPackageReleaseDate "snapshot-20240912" +#define public MagickPackageVersionAddendum ".020240913" +#define public MagickPackageReleaseDate "snapshot-20240913" diff -r effa76bf2394 -r c01449a5a8df config/Makefile.am --- a/config/Makefile.am Thu Sep 12 10:41:35 2024 -0500 +++ b/config/Makefile.am Fri Sep 13 14:40:28 2024 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2004 GraphicsMagick Group +# Copyright (C) 2004-2024 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -24,6 +24,7 @@ config/type-ghostscript.mgk \ config/type.mgk \ config/type-solaris.mgk \ + config/type-urw-base35-otf.mgk \ config/type-windows.mgk CONFIG_EXTRA_DIST = \ @@ -33,6 +34,6 @@ config/modules.mgk \ config/type-ghostscript.mgk.in \ config/type-solaris.mgk.in \ + config/type-urw-base35-otf.mgk.in \ config/type-windows.mgk.in \ config/type.mgk.in - diff -r effa76bf2394 -r c01449a5a8df config/type-urw-base35-otf.mgk.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/type-urw-base35-otf.mgk.in Fri Sep 13 14:40:28 2024 -0500 @@ -0,0 +1,375 @@ +<?xml version="1.0"?> +<!-- +Mapping for Artifex urw-base35-fonts available from https://github.com/ArtifexSoftware/urw-base35-fonts +and typically installed under /usr/share/fonts/opentype/urw-base35 on a Debian/Ubuntu system as +part of the fonts-urw-base35 package. Starting with Ubuntu 22.04 LTS. + +Font mapping comes from /etc/ghostscript/fontmap.d/10fonts-urw-base35.conf on a Debian/Ubuntu system. +--> +<typemap> + <type + name="AvantGarde-Book" + fullname="AvantGarde Book" + family="AvantGarde" + foundry="URW" + weight="400" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="AvantGarde-BookOblique" + fullname="AvantGarde Book Oblique" + family="AvantGarde" + foundry="URW" + weight="400" + style="oblique" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="AvantGarde-Demi" + fullname="AvantGarde DemiBold" + family="AvantGarde" + foundry="URW" + weight="600" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="AvantGarde-DemiOblique" + fullname="AvantGarde DemiOblique" + family="AvantGarde" + foundry="URW" + weight="600" + style="oblique" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Bookman-Demi" + fullname="Bookman DemiBold" + family="Bookman" + foundry="URW" + weight="600" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Bookman-DemiItalic" + fullname="Bookman DemiBold Italic" + family="Bookman" + foundry="URW" + weight="600" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Bookman-Light" + fullname="Bookman Light" + family="Bookman" + foundry="URW" + weight="300" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Bookman-LightItalic" + fullname="Bookman Light Italic" + family="Bookman" + foundry="URW" + weight="300" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Courier" + fullname="Courier Regular" + family="Courier" + foundry="URW" + weight="400" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Courier-Bold" + fullname="Courier Bold" + family="Courier" + foundry="URW" + weight="700" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Courier-Oblique" + fullname="Courier Regular Oblique" + family="Courier" + foundry="URW" + weight="400" + style="oblique" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Courier-BoldOblique" + fullname="Courier Bold Oblique" + family="Courier" + foundry="URW" + weight="700" + style="oblique" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica" + fullname="Helvetica Regular" + family="Helvetica" + foundry="URW" + weight="400" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-Bold" + fullname="Helvetica Bold" + family="Helvetica" + foundry="URW" + weight="700" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-Oblique" + fullname="Helvetica Regular Italic" + family="Helvetica" + foundry="URW" + weight="400" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-BoldOblique" + fullname="Helvetica Bold Italic" + family="Helvetica" + foundry="URW" + weight="700" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-Narrow" + fullname="Helvetica Narrow" + family="Helvetica Narrow" + foundry="URW" + weight="400" + style="normal" + stretch="condensed" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-Narrow-Oblique" + fullname="Helvetica Narrow Oblique" + family="Helvetica Narrow" + foundry="URW" + weight="400" + style="oblique" + stretch="condensed" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-Narrow-Bold" + fullname="Helvetica Narrow Bold" + family="Helvetica Narrow" + foundry="URW" + weight="700" + style="normal" + stretch="condensed" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Helvetica-Narrow-BoldOblique" + fullname="Helvetica Narrow Bold Oblique" + family="Helvetica Narrow" + foundry="URW" + weight="700" + style="oblique" + stretch="condensed" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="NewCenturySchlbk-Roman" + fullname="New Century Schoolbook" + family="NewCenturySchlbk" + foundry="URW" + weight="400" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="NewCenturySchlbk-Italic" + fullname="New Century Schoolbook Italic" + family="NewCenturySchlbk" + foundry="URW" + weight="400" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="NewCenturySchlbk-Bold" + fullname="New Century Schoolbook Bold" + family="NewCenturySchlbk" + foundry="URW" + weight="700" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="NewCenturySchlbk-BoldItalic" + fullname="New Century Schoolbook Bold Italic" + family="NewCenturySchlbk" + foundry="URW" + weight="700" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Palatino-Roman" + fullname="Palatino Regular" + family="Palatino" + foundry="URW" + weight="400" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Palatino-Italic" + fullname="Palatino Italic" + family="Palatino" + foundry="URW" + weight="400" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Palatino-Bold" + fullname="Palatino Bold" + family="Palatino" + foundry="URW" + weight="700" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Palatino-BoldItalic" + fullname="Palatino Bold Italic" + family="Palatino" + foundry="URW" + weight="700" + style="italic" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Times-Roman" + fullname="Times Regular" + family="Times" + foundry="URW" + weight="400" + style="normal" + stretch="normal" + format="opentype" + glyphs="@[email protected]" + /> + <type + name="Times-Bold" + fullname="Times Medium" + family="Times" + foundry="URW" + weight="700" + style="normal" + stretch="normal"