]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 5163: Update URW++ OTF files
authorMasamichi Hosoda <trueroad@trueroad.jp>
Wed, 26 Jul 2017 11:53:58 +0000 (20:53 +0900)
committerMasamichi Hosoda <trueroad@trueroad.jp>
Tue, 1 Aug 2017 13:00:10 +0000 (22:00 +0900)
URW++ has been released URW++ core 35 fonts 2017-07-20.
It has some bugfixes.

This commit makes configure script can find latest URW++ OTF files (2017-07-20).
http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=1f28a6fcd2176256a995db907d9ffe6e1b9b83e9

It also can find previously released files (2017-05 and 2016).
http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=e3c665a8a3df36a54b22ad0b6176283db5310f97
http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=79bcdfb34fbce12b592cce389fa7a19da6b5b018

configure.ac

index 11addfb70044067bb4966f864519f2113a2ffb1f..8e3cabe01efe4359f5e51c57c47b0bd608e44ce4 100644 (file)
@@ -127,8 +127,8 @@ if test "$URWOTF_DIR" != "" ;  then
            C059-Italic.otf C059-Roman.otf \
            NimbusMonoPS-Bold.otf NimbusMonoPS-BoldItalic.otf \
            NimbusMonoPS-Italic.otf NimbusMonoPS-Regular.otf \
-           NimbusSans-Bold.otf NimbusSans-BoldOblique.otf \
-           NimbusSans-Oblique.otf NimbusSans-Regular.otf; do
+           NimbusSans-Bold.otf NimbusSans-BoldItalic.otf \
+           NimbusSans-Italic.otf NimbusSans-Regular.otf; do
     if test ! -f "$URWOTF_DIR/$f"; then
       MISSING_URWOTF_FILES="$MISSING_URWOTF_FILES $f"
     else
@@ -136,6 +136,12 @@ if test "$URWOTF_DIR" != "" ;  then
     fi
   done
 fi
+if test "$MISSING_URWOTF_FILES"="NimbusSans-BoldItalic.otf NimbusSans-Italic.otf" && \
+   test -f "$URWOTF_DIR/NimbusSans-BoldOblique.otf" && \
+   test -f "$URWOTF_DIR/NimbusSans-Oblique.otf"; then
+  MISSING_URWOTF_FILES=""
+  URWOTF_FILES="$URWOTF_FILES NimbusSans-BoldOblique.otf NimbusSans-Oblique.otf"
+fi
 if test "$URWOTF_DIR" = "" -o "$MISSING_URWOTF_FILES" != ""; then
   AC_MSG_RESULT(no)
   STEPMAKE_ADD_ENTRY(OPTIONAL,URW++ OTF fonts)
@@ -143,7 +149,7 @@ if test "$URWOTF_DIR" = "" -o "$MISSING_URWOTF_FILES" != ""; then
     if test "$FCLIST" = ""; then
       STEPMAKE_ADD_ENTRY(OPTIONAL,'(install the fc-list utility from FontConfig, or use --with-urwotf-dir)')
     else
-      STEPMAKE_ADD_ENTRY(OPTIONAL,"(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=commit;h=79bcdfb34fbce12b592cce389fa7a19da6b5b018' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)")
+      STEPMAKE_ADD_ENTRY(OPTIONAL,"(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=1f28a6fcd2176256a995db907d9ffe6e1b9b83e9' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)")
     fi
   else
     STEPMAKE_ADD_ENTRY(OPTIONAL,'(these files are missing: $MISSING_URWOTF_FILES)')