https://github.com/ImageMagick/ImageMagick/issues/782
diff --git a/ChangeLog b/ChangeLog
index c093329..7cb09fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-09-28 7.0.7-5 Cristy <quetzlzacatenango@image...>
+ * Support URW-base35 fonts.
+
2017-09-26 7.0.7-5 Glenn Randers-Pehrson <glennrp@image...>
* Removed "ping_preserve_iCCP=MagickTrue;" statement that was inadvertently
added to coders/png.c (reference
diff --git a/Makefile.in b/Makefile.in
index f7efb36..568bbc6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2895,6 +2895,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
type_include_files = @type_include_files@
+urw_base35_font_dir = @urw_base35_font_dir@
windows_font_dir = @windows_font_dir@
topincludedir = @includedir@/MagickCore
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
@@ -3044,6 +3045,7 @@
config/type-apple.xml \
config/type-dejavu.xml \
config/type-ghostscript.xml \
+ config/type-urw-base35.xml.in \
config/type-windows.xml
CONFIG_EXTRA_DIST = \
@@ -3068,6 +3070,7 @@
config/type-apple.xml.in \
config/type-dejavu.xml.in \
config/type-ghostscript.xml.in \
+ config/type-urw-base35.xml.in \
config/type-windows.xml.in \
config/type.xml.in
diff --git a/config/Makefile.am b/config/Makefile.am
index 0e8ec7b..9bfb9f0 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -45,6 +45,7 @@
config/type-apple.xml \
config/type-dejavu.xml \
config/type-ghostscript.xml \
+ config/type-urw-base35.xml.in \
config/type-windows.xml
CONFIG_EXTRA_DIST = \
@@ -69,5 +70,6 @@
config/type-apple.xml.in \
config/type-dejavu.xml.in \
config/type-ghostscript.xml.in \
+ config/type-urw-base35.xml.in \
config/type-windows.xml.in \
config/type.xml.in
diff --git a/config/type-urw-base35.xml.in b/config/type-urw-base35.xml.in
new file mode 100644
index 0000000..993613e
--- /dev/null
+++ b/config/type-urw-base35.xml.in
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE typemap [
+ <!ELEMENT typemap (type)+>
+ <!ATTLIST typemap xmlns CDATA #FIXED ''>
+ <!ELEMENT type EMPTY>
+ <!ATTLIST type xmlns CDATA #FIXED '' encoding NMTOKEN #IMPLIED
+ family CDATA #REQUIRED format NMTOKEN #REQUIRED foundry NMTOKEN #REQUIRED
+ fullname CDATA #REQUIRED glyphs CDATA #REQUIRED metrics CDATA #REQUIRED
+ name NMTOKEN #REQUIRED stretch NMTOKEN #REQUIRED style NMTOKEN #REQUIRED
+ version CDATA #IMPLIED weight CDATA #REQUIRED>
+]>
+<!--
+ ImageMagick URW-base35 font configuration.
+-->
+<typemap>
+ <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-Book.afm" glyphs="@urw_base35_font_dir@URWGothic-Book.t1"/>
+ <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-BookOblique.afm" glyphs="@urw_base35_font_dir@URWGothic-BookOblique.t1"/>
+ <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-Demi.afm" glyphs="@urw_base35_font_dir@URWGothic-Demi.t1"/>
+ <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWGothic-DemiOblique.afm" glyphs="@urw_base35_font_dir@URWGothic-DemiOblique.t1"/>
+ <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-Demi.afm" glyphs="@urw_base35_font_dir@URWBookman-Demi.t1"/>
+ <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-DemiItalic.afm" glyphs="@urw_base35_font_dir@URWBookman-DemiItalic.t1"/>
+ <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-Light.afm" glyphs="@urw_base35_font_dir@URWBookman-Light.t1"/>
+ <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@URWBookman-LightItalic.afm" glyphs="@urw_base35_font_dir@URWBookman-LightItalic.t1"/>
+ <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-Refular.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-Regular.t1"/>
+ <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-Bold.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-Bold.t1"/>
+ <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-Italic.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-Italic.t1"/>
+ <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusMonoPS-BoldItalic.afm" glyphs="@urw_base35_font_dir@NimbusMonoPS-BoldItalic.t1"/>
+ <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Regular.afm" glyphs="@urw_base35_font_dir@NimbusSans-Regular.t1"/>
+ <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Regular.afm" glyphs="@urw_base35_font_dir@NimbusSans-Regular.t1"/>
+ <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Bold.afm" glyphs="@urw_base35_font_dir@NimbusSans-Bold.t1"/>
+ <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-Italic.afm" glyphs="@urw_base35_font_dir@NimbusSans-Italic.t1"/>
+ <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusSans-BoldItalic.afm" glyphs="@urw_base35_font_dir@NimbusSans-BoldItalic.t1"/>
+ <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@NimbusSansNarrow-Regular.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-Regular.t1"/>
+ <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@NimbusSansNarrow-Oblique.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-Oblique.t1"/>
+ <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@NimbusSansNarrow-Bold.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-Bold.t1"/>
+ <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="@urw_base35_font_dir@nNimbusSansNarrow-BdOblique.afm" glyphs="@urw_base35_font_dir@NimbusSansNarrow-BdOblique.t1"/>
+ <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-Roman.afm" glyphs="@urw_base35_font_dir@C059-Roman.t1"/>
+ <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-Italic.afm" glyphs="@urw_base35_font_dir@C059-Italic.t1"/>
+ <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-Bold.afm" glyphs="@urw_base35_font_dir@C059-Bold.t1"/>
+ <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@C059-BdIta.afm" glyphs="@urw_base35_font_dir@C059-BdIta.t1"/>
+ <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-Roman.afm" glyphs="@urw_base35_font_dir@P052-Roman.t1"/>
+ <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-Italic.afm" glyphs="@urw_base35_font_dir@P052-Italic.t1"/>
+ <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-Bold.afm" glyphs="@urw_base35_font_dir@P052-Bold.t1"/>
+ <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@P052-BoldItalic.afm" glyphs="@urw_base35_font_dir@P052-BoldItalic.t1"/>
+ <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-Regular.afm" glyphs="@urw_base35_font_dir@NimbusRoman-Regular.t1"/>
+ <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-Bold.afm" glyphs="@urw_base35_font_dir@NimbusRoman-Bold.t1"/>
+ <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-Italic.afm" glyphs="@urw_base35_font_dir@NimbusRoman-Italic.t1"/>
+ <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@urw_base35_font_dir@NimbusRoman-BoldItalic.afm" glyphs="@urw_base35_font_dir@NimbusRoman-BoldItalic.t1"/>
+ <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@urw_base35_font_dir@StandardSymbolsPS.afm" glyphs="@urw_base35_font_dir@StandardSymbolsPS.t1" version="2.0" encoding="AdobeCustom"/>
+</typemap>
diff --git a/configure b/configure
index adffe17..0b7b277 100755
--- a/configure
+++ b/configure
@@ -685,6 +685,7 @@
ShowImageDelegate
type_include_files
windows_font_dir
+urw_base35_font_dir
ghostscript_font_dir
dejavu_font_dir
apple_font_dir
@@ -1224,6 +1225,7 @@
with_raw
with_rsvg
with_tiff
+with_urw_base35_font_dir
with_webp
with_windows_font_dir
with_wmf
@@ -2029,6 +2031,8 @@
--without-raw disable Raw support
--with-rsvg enable RSVG support
--without-tiff disable TIFF support
+ --with-urw-base35-font-dir=DIR
+ URW-base35 font directory
--without-webp disable WEBP support
--with-windows-font-dir=DIR
Windows font directory
@@ -4530,7 +4534,7 @@
MAGICK_VERSION=7.0.7-5
-MAGICK_GIT_REVISION=21266:e3c601c92:20170923
+MAGICK_GIT_REVISION=21287:13604697e:20170927
# Substitute library versioning
@@ -34675,6 +34679,22 @@
+#
+# Set URW Base35 font directory.
+#
+
+# Check whether --with-urw-base35-font-dir was given.
+if test "${with_urw_base35_font_dir+set}" = set; then :
+ withval=$with_urw_base35_font_dir; with_urw_base35_font_dir=$withval
+else
+ with_urw_base35_font_dir='default'
+fi
+
+
+if test "$with_urw_base35_font_dir" != 'default'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-urw-base35-font-dir=$with_urw_base35_font_dir "
+fi
+
#
# Check for WEBP delegate library.
@@ -34786,6 +34806,7 @@
+
#
# Set Windows font directory.
#
@@ -37056,6 +37077,30 @@
;;
esac
+# URW-base35 fonts.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for URW-base35 fonts directory" >&5
+$as_echo_n "checking for URW-base35 fonts directory... " >&6; }
+urw_base35_font_dir=''
+if test "${with_urw_base35_font_dir}" != 'default'; then
+ urw_base35_font_dir="${with_urw_base35_font_dir}/"
+else
+ for font_dir in "${prefix}/share/urw-base35/fonts/" '/usr/share/fonts/urw-base35/'; do
+ if test -f "${font_dir}StandardSymbolsPS.t1"; then
+ urw_base35_font_dir="${font_dir}"
+ break 1
+ fi
+ done
+fi
+if test "${urw_base35_font_dir}x" != 'x'; then
+ type_include_files="${type_include_files} "'<include file="type-urw-base35.xml" />'
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $urw_base35_font_dir" >&5
+$as_echo "$urw_base35_font_dir" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found!" >&5
+$as_echo "not found!" >&6; };
+fi
+
+
# Windows fonts.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows fonts directory" >&5
$as_echo_n "checking for Windows fonts directory... " >&6; }
@@ -41153,6 +41198,7 @@
Apple fonts --with-apple-font-dir=$with_apple_font_dir $result_apple_font_dir
Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir
Ghostscript fonts --with-gs-font-dir=$with_gs_font_dir $result_ghostscript_font_dir
+ URW-base35 fonts --with-urw-base35-font-dir=$with_urw_base35_font_dir $result_urw_base35_font_dir
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
X11 Configuration:
@@ -41241,6 +41287,7 @@
Apple fonts --with-apple-font-dir=$with_apple_font_dir $result_apple_font_dir
Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir
Ghostscript fonts --with-gs-font-dir=$with_gs_font_dir $result_ghostscript_font_dir
+ URW-base35 fonts --with-urw-base35-font-dir=$with_urw_base35_font_dir $result_urw_base35_font_dir
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
X11 Configuration:
diff --git a/configure.ac b/configure.ac
index 151b642..0ff2411 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2724,6 +2724,19 @@
AM_CONDITIONAL(TIFF_DELEGATE, test "$have_tiff" = 'yes')
AC_SUBST(TIFF_LIBS)
+#
+# Set URW Base35 font directory.
+#
+AC_ARG_WITH([urw-base35-font-dir],
+ [AC_HELP_STRING([--with-urw-base35-font-dir=DIR],
+ [URW-base35 font directory])],
+ [with_urw_base35_font_dir=$withval],
+ [with_urw_base35_font_dir='default'])
+
+if test "$with_urw_base35_font_dir" != 'default'; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-urw-base35-font-dir=$with_urw_base35_font_dir "
+fi
+
dnl ===========================================================================
#
@@ -2768,6 +2781,7 @@
AM_CONDITIONAL(WEBP_DELEGATE,test "$have_webp" = 'yes')
AC_SUBST(WEBP_LIBS)
+
dnl ===========================================================================
#
@@ -3273,6 +3287,27 @@
;;
esac
+# URW-base35 fonts.
+AC_MSG_CHECKING(for URW-base35 fonts directory)
+urw_base35_font_dir=''
+if test "${with_urw_base35_font_dir}" != 'default'; then
+ urw_base35_font_dir="${with_urw_base35_font_dir}/"
+else
+ for font_dir in "${prefix}/share/urw-base35/fonts/" '/usr/share/fonts/urw-base35/'; do
+ if test -f "${font_dir}StandardSymbolsPS.t1"; then
+ urw_base35_font_dir="${font_dir}"
+ break 1
+ fi
+ done
+fi
+if test "${urw_base35_font_dir}x" != 'x'; then
+ type_include_files="${type_include_files} "'<include file="type-urw-base35.xml" />'
+ AC_MSG_RESULT([$urw_base35_font_dir])
+else
+ AC_MSG_RESULT([not found!]);
+fi
+AC_SUBST(urw_base35_font_dir)
+
# Windows fonts.
AC_MSG_CHECKING(for Windows fonts directory)
windows_font_dir=''
@@ -3975,6 +4010,7 @@
Apple fonts --with-apple-font-dir=$with_apple_font_dir $result_apple_font_dir
Dejavu fonts --with-dejavu-font-dir=$with_dejavu_font_dir $result_dejavu_font_dir
Ghostscript fonts --with-gs-font-dir=$with_gs_font_dir $result_ghostscript_font_dir
+ URW-base35 fonts --with-urw-base35-font-dir=$with_urw_base35_font_dir $result_urw_base35_font_dir
Windows fonts --with-windows-font-dir=$with_windows_font_dir $result_windows_font_dir
X11 Configuration: