Hello community, here is the log from the commit of package fonttosfnt for openSUSE:Factory checked in at 2020-11-02 09:37:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fonttosfnt (Old) and /work/SRC/openSUSE:Factory/.fonttosfnt.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fonttosfnt" Mon Nov 2 09:37:51 2020 rev:9 rq:844523 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/fonttosfnt/fonttosfnt.changes 2020-01-07 23:54:11.144057232 +0100 +++ /work/SRC/openSUSE:Factory/.fonttosfnt.new.3463/fonttosfnt.changes 2020-11-02 09:37:57.809470028 +0100 @@ -1,0 +2,6 @@ +Wed Oct 21 09:17:35 UTC 2020 - Stefan Dirsch <sndir...@suse.com> + +- Update to version 1.2.0 + * This release contains a bunch of fixes all over the place + +------------------------------------------------------------------- Old: ---- fonttosfnt-1.1.0.tar.bz2 New: ---- fonttosfnt-1.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonttosfnt.spec ++++++ --- /var/tmp/diff_new_pack.LqRyGD/_old 2020-11-02 09:37:58.369470565 +0100 +++ /var/tmp/diff_new_pack.LqRyGD/_new 2020-11-02 09:37:58.369470565 +0100 @@ -1,7 +1,7 @@ # # spec file for package fonttosfnt # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,12 +17,12 @@ Name: fonttosfnt -Version: 1.1.0 +Version: 1.2.0 Release: 0 Summary: Utility to wrap a bitmap font in a sfnt (TrueType) wrapper License: MIT Group: System/X11/Utilities -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(fontenc) ++++++ fonttosfnt-1.1.0.tar.bz2 -> fonttosfnt-1.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/ChangeLog new/fonttosfnt-1.2.0/ChangeLog --- old/fonttosfnt-1.1.0/ChangeLog 2020-01-06 03:57:56.000000000 +0100 +++ new/fonttosfnt-1.2.0/ChangeLog 2020-10-21 08:41:07.000000000 +0200 @@ -1,3 +1,135 @@ +commit 91af80a0aa18c969cd90668eed80bcbfc1e40661 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Oct 21 16:36:30 2020 +1000 + + Bump to 1.2.0 + +commit ca9ad454496bebbc37125959d049cf2173c07c2a +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Sun Aug 16 21:56:15 2020 +0200 + + use PIXEL_SIZE to calculate lineGap + +commit 0447b81053d4ccaa1e1b0087bf6076abae431cae +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Fri Jul 31 00:07:26 2020 +0200 + + fix sign of sTypoDescender + +commit 747c58aa17b9adc016aed0caab049417a20f0b22 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Thu Jul 30 22:46:50 2020 +0200 + + calculate capHeight and xHeight as recommended + +commit 64e7f386baf69fa6857047fc8ad9b4cd9a8185f1 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Thu Jul 30 21:34:59 2020 +0200 + + move metrics calculation to write.c + +commit 19412d9ac3fb7f00346273cfe914601c844f5872 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Sat Jul 18 08:39:01 2020 +0200 + + Add warnings when wrapping multiple fonts and on PCF fonts + +commit 1fa97fdc6dc900728be8523be89096b4cb117d4d +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Sun Jul 12 15:36:18 2020 +0200 + + provide version 5 OS/2 table + + this was an attempt to fix linespacing, which did not help, but + would still keep it around to avoid double efforts. + +commit facf71184163d50adf0b8fccffcaffa18b7bd277 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Sun Jul 12 15:12:59 2020 +0200 + + use design metrics in eblc instead of calculated metrics + + This will probably not work for a font providing multiple strikes. + But .bdf fonts don't provide multiple strikes (or do they?!?) + I don't know about .pcf fonts, but I would recommend against running fonttosfnt + on .pcf fonts because bdf2pcf seems to loose some attributes during conversion. + +commit 9fb05de7d6c57d045b4a88516f3c28cf3cf98722 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Tue Jul 7 21:02:56 2020 +0200 + + use more properties according to XLFD + +commit 58cbf737557f34744b950668e3354ec2f2dae766 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Mon Jul 6 22:50:23 2020 +0200 + + use standard C rounding functions + +commit f8fa7919397659fb0ac5dade75152343d57f20ce +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Tue Jun 16 18:43:12 2020 +0200 + + correctly set OS2 fsSelection for italic and bold fonts + +commit 1df352c9e862686692ac053b838d76a36d721805 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Mon Jun 15 14:08:49 2020 +0200 + + truncate foundry if there is no known abbreviation. + + Honestly I have no idea why the foundry needs to fit in four bytes. + But anyway truncation might indeed be better then "UNKN" ? + + Anyone more knowledgeable than me out there? + +commit 8532812f1eddfadc0bcfad220b283bf5990bba10 +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Sun May 31 08:02:24 2020 +0200 + + use zero lineGap, sTypoDescender should be negative + + According to + https://simoncozens.github.io/fonts-and-layout/opentype.html#vertical-metrics-hhea-and-os2 + sTypoDescender should be negative and lineGap should be zero. + +commit de8068f9c4251fb6cb9407c07bf245e1937270bc +Author: Christopher Zimmermann <madro...@gmerlin.de> +Date: Sun May 31 07:58:10 2020 +0200 + + don't add arbitrary number to the glypth metrics + + This caused pango to calculate wrong, too large font extents and in + consequence gvim used too large character cells. + +commit 7096c58f3fe3b6c79508cb16daac5c5bb2f042e7 +Author: Peng Wu <p...@redhat.com> +Date: Thu Jun 11 14:09:35 2020 +0800 + + Guess Regular style for Medium Weight + + X Logical Font Description recognize "Medium" as "Regular". + Update the faceWeight function to change style from "Medium" to "Regular". + +commit 81a61c049e6de80120531f0770b22e7637c9acb9 +Author: rnhmjoj <rnhm...@inventati.org> +Date: Fri Feb 7 17:47:52 2020 +0100 + + Fix uninitialised memory write + + If macTime() fails write zeros instead of unitialized memory to + the date fields. + +commit 51e8117654fb092ae5412d7aa184bfc6b498c954 +Author: rnhmjoj <rnhm...@inventati.org> +Date: Fri Feb 7 17:46:54 2020 +0100 + + Fix incorrect error handling in macTime() + + mktime() and time() return (time_t -1) to signal an error. + Checking for negative values will incorrectly assume an error + happened for any calendar date before the unix epoch. + commit 1d757ff6fa30079790fc44b141f6d0e4d5411f13 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Mon Jan 6 12:55:31 2020 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/Makefile.in new/fonttosfnt-1.2.0/Makefile.in --- old/fonttosfnt-1.1.0/Makefile.in 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/Makefile.in 2020-10-21 08:41:05.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,8 +190,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -710,6 +710,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -752,6 +756,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -946,7 +952,7 @@ clean-binPROGRAMS clean-cscope clean-generic cscope \ cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ + dist-zip dist-zstd distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ info-am install install-am install-binPROGRAMS install-data \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/aclocal.m4 new/fonttosfnt-1.2.0/aclocal.m4 --- old/fonttosfnt-1.1.0/aclocal.m4 2020-01-06 03:57:52.000000000 +0100 +++ new/fonttosfnt-1.2.0/aclocal.m4 2020-10-21 08:41:04.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2283,7 +2283,7 @@ AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2298,7 +2298,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -2314,14 +2314,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2373,7 +2373,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2404,7 +2404,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2595,7 +2595,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2634,7 +2634,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -2661,7 +2663,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2858,7 +2860,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2879,7 +2881,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2900,7 +2902,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2943,7 +2945,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2982,7 +2984,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3011,7 +3013,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3058,7 +3060,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3077,7 +3079,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3158,7 +3160,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3218,7 +3220,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3246,7 +3248,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -3265,7 +3267,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/compile new/fonttosfnt-1.2.0/compile --- old/fonttosfnt-1.1.0/compile 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/compile 2020-10-21 08:41:05.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/configure new/fonttosfnt-1.2.0/configure --- old/fonttosfnt-1.1.0/configure 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/configure 2020-10-21 08:41:04.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for fonttosfnt 1.1.0. +# Generated by GNU Autoconf 2.69 for fonttosfnt 1.2.0. # # Report bugs to <https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues>. # @@ -581,8 +581,8 @@ # Identity of this package. PACKAGE_NAME='fonttosfnt' PACKAGE_TARNAME='fonttosfnt' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='fonttosfnt 1.1.0' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='fonttosfnt 1.2.0' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues' PACKAGE_URL='' @@ -1309,7 +1309,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fonttosfnt 1.1.0 to adapt to many kinds of systems. +\`configure' configures fonttosfnt 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1379,7 +1379,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fonttosfnt 1.1.0:";; + short | recursive ) echo "Configuration of fonttosfnt 1.2.0:";; esac cat <<\_ACEOF @@ -1485,7 +1485,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fonttosfnt configure 1.1.0 +fonttosfnt configure 1.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1809,7 +1809,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fonttosfnt $as_me 1.1.0, which was +It was created by fonttosfnt $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2677,7 +2677,7 @@ # Define the identity of the package. PACKAGE='fonttosfnt' - VERSION='1.1.0' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -11372,7 +11372,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fonttosfnt $as_me 1.1.0, which was +This file was extended by fonttosfnt $as_me 1.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11438,7 +11438,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -fonttosfnt config.status 1.1.0 +fonttosfnt config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -12248,7 +12248,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/configure.ac new/fonttosfnt-1.2.0/configure.ac --- old/fonttosfnt-1.1.0/configure.ac 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/configure.ac 2020-10-21 08:41:02.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT(fonttosfnt,[1.1.0], [https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues],fonttosfnt) +AC_INIT(fonttosfnt,[1.2.0], [https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues],fonttosfnt) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/depcomp new/fonttosfnt-1.2.0/depcomp --- old/fonttosfnt-1.1.0/depcomp 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/depcomp 2020-10-21 08:41:05.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/fonttosfnt.c new/fonttosfnt-1.2.0/fonttosfnt.c --- old/fonttosfnt-1.1.0/fonttosfnt.c 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/fonttosfnt.c 2020-10-21 08:41:02.000000000 +0200 @@ -106,6 +106,12 @@ font = makeFont(); + if(argc - i > 1) + fprintf(stderr, + "You are requesting to put more than one font into a single OpenType font.\n" + "This is not recommended. The global font metrics will not match every font face.\n" + "The creation of an OpenType font collection is recommended.\n"); + if(i == argc) { rc = readFile(NULL, font); if(rc != 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/fonttosfnt.h new/fonttosfnt-1.2.0/fonttosfnt.h --- old/fonttosfnt-1.1.0/fonttosfnt.h 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/fonttosfnt.h 2020-10-21 08:41:02.000000000 +0200 @@ -29,6 +29,7 @@ #endif #include <stdarg.h> +#include <math.h> #include <ft2build.h> #include FT_FREETYPE_H @@ -69,17 +70,15 @@ #define UNITS_PER_EM 2048 -#define EPSILON 0.000000001 -#define FLOOR(x) ((x) < 0.0 ? -(int)(-(x)) : (x)) -#define CEIL(x) FLOOR((x) + 1.0 - EPSILON) +#define UNDEF 0x80000000 /* Convert a fixed-point value into FUnits */ #define FONT_UNITS(x) \ - FLOOR(((double)(x)) / TWO_SIXTEENTH * UNITS_PER_EM + 0.5) + round(((double)(x)) / TWO_SIXTEENTH * UNITS_PER_EM) #define FONT_UNITS_FLOOR(x) \ - FLOOR(((double)(x)) / TWO_SIXTEENTH * UNITS_PER_EM) + floor(((double)(x)) / TWO_SIXTEENTH * UNITS_PER_EM) #define FONT_UNITS_CEIL(x) \ - CEIL(((double)(x)) / TWO_SIXTEENTH * UNITS_PER_EM) + ceil(((double)(x)) / TWO_SIXTEENTH * UNITS_PER_EM) typedef struct _FontNameEntry { int nid; /* name id */ @@ -87,6 +86,23 @@ char *value; } FontNameEntryRec, *FontNameEntryPtr; +typedef struct _Metrics { + int height; + int size; + int maxX; + int minX; + int maxY; + int minY; + int xHeight; + int capHeight; + int maxAwidth; + int awidth; + int ascent; + int descent; + int underlinePosition; + int underlineThickness; +} MetricsRec, *MetricsPtr; + typedef struct _Font { int numNames; struct _FontNameEntry *names; @@ -94,8 +110,8 @@ int weight; /* as in the OS/2 table */ int width; /* as in the OS/2 table */ int italicAngle; /* degrees c-clockwise from the vertical */ - int underlinePosition; - int underlineThickness; + MetricsRec pxMetrics; + MetricsRec metrics; unsigned foundry; struct _Strike *strikes; } FontRec, *FontPtr; @@ -152,9 +168,9 @@ int findIndex(CmapPtr, int); int findCode(CmapPtr, int); BitmapPtr strikeBitmapIndex(StrikePtr, CmapPtr, int); -void strikeMetrics(StrikePtr, int*, int*, int*, int*, int*); +int strikeMaxWidth(StrikePtr); int glyphMetrics(FontPtr, int, int*, int*, int*, int*, int*); -void fontMetrics(FontPtr, int*, int*, int*, int*, int*); +void fontMetrics(FontPtr); int maxIndex(CmapPtr); int readFile(char *filename, FontPtr); @@ -174,6 +190,7 @@ unsigned faceFoundry(FT_Face); char *faceEncoding(FT_Face); int faceFlags(FT_Face); +int faceIntProp(FT_Face, const char *); int faceWeight(FT_Face); int faceWidth(FT_Face); int faceItalicAngle(FT_Face); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/install-sh new/fonttosfnt-1.2.0/install-sh --- old/fonttosfnt-1.1.0/install-sh 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/install-sh 2020-10-21 08:41:05.000000000 +0200 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/man/Makefile.in new/fonttosfnt-1.2.0/man/Makefile.in --- old/fonttosfnt-1.1.0/man/Makefile.in 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/man/Makefile.in 2020-10-21 08:41:05.000000000 +0200 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/missing new/fonttosfnt-1.2.0/missing --- old/fonttosfnt-1.1.0/missing 2020-01-06 03:57:53.000000000 +0100 +++ new/fonttosfnt-1.2.0/missing 2020-10-21 08:41:05.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/read.c new/fonttosfnt-1.2.0/read.c --- old/fonttosfnt-1.1.0/read.c 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/read.c 2020-10-21 08:41:02.000000000 +0200 @@ -29,6 +29,7 @@ #include FT_FREETYPE_H #include FT_MODULE_H #include FT_BDF_H +#include FT_FONT_FORMATS_H #include "X11/Xos.h" #include "fonttosfnt.h" #include "X11/fonts/fontenc.h" @@ -102,7 +103,7 @@ BitmapPtr bitmap; int symbol = 0; int force_unicode = 1; - char *encoding_name = NULL; + const char *encoding_name, *file_format; FontMapPtr mapping = NULL; FontMapReversePtr reverse = NULL; @@ -133,6 +134,15 @@ return -1; } + file_format = FT_Get_Font_Format(face); + if(strcmp(file_format, "BDF") != 0) + fprintf(stderr, + "font file %s is of format %s.\n" + "It's recommended to convert directly from a BDF font.\n" + "Some font properties may get lost when converting via a PCF font.\n", + filename ? filename : "<stdin>", + file_format); + /* FreeType will insist on encodings which are simple subsets of unicode * to be read as unicode regardless of what we call them. */ for(j = 0; j < face->num_charmaps; ++j) { @@ -258,30 +268,6 @@ i++; #endif font->numNames = i; - - font->flags = faceFlags(face) | (symbol ? FACE_SYMBOL : 0); - font->weight = faceWeight(face); - font->width = faceWidth(face); - font->foundry = faceFoundry(face); - font->italicAngle = faceItalicAngle(face); - - rc = FT_Get_BDF_Property(face, "UNDERLINE_POSITION", &prop); - if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER) - font->underlinePosition = - (double)prop.u.integer / face->available_sizes[0].height * - TWO_SIXTEENTH; - else - font->underlinePosition = - - 1.5 / face->available_sizes[0].height * TWO_SIXTEENTH; - - rc = FT_Get_BDF_Property(face, "UNDERLINE_THICKNESS", &prop); - if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER) - font->underlineThickness = - (double)prop.u.integer / face->available_sizes[0].height * - TWO_SIXTEENTH; - else - font->underlineThickness = - 1.0 / face->available_sizes[0].height * TWO_SIXTEENTH; } if(face->num_fixed_sizes == 0) { @@ -304,6 +290,20 @@ return -1; } + font->flags = faceFlags(face) | (symbol ? FACE_SYMBOL : 0); + font->weight = faceWeight(face); + font->width = faceWidth(face); + font->foundry = faceFoundry(face); + font->italicAngle = faceItalicAngle(face); + font->pxMetrics.height = face->available_sizes[0].height; + font->pxMetrics.size = faceIntProp(face, "PIXEL_SIZE"); + font->pxMetrics.xHeight = faceIntProp(face, "X_HEIGHT"); + font->pxMetrics.capHeight = faceIntProp(face, "CAP_HEIGHT"); + font->pxMetrics.ascent = faceIntProp(face, "FONT_ASCENT"); + font->pxMetrics.descent = faceIntProp(face, "FONT_DESCENT"); + font->pxMetrics.underlinePosition = faceIntProp(face, "UNDERLINE_POSITION"); + font->pxMetrics.underlineThickness = faceIntProp(face, "UNDERLINE_THICKNESS"); + for(int i = 0; i < face->num_fixed_sizes; i++) { if(verbose_flag) fprintf(stderr, "size %d: %dx%d\n", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/struct.c new/fonttosfnt-1.2.0/struct.c --- old/fonttosfnt-1.1.0/struct.c 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/struct.c 2020-10-21 08:41:02.000000000 +0200 @@ -42,8 +42,32 @@ font->weight = 500; font->width = 5; font->italicAngle = 0; - font->underlinePosition = - TWO_SIXTEENTH; - font->underlineThickness = TWO_SIXTEENTH; + font->pxMetrics.height = UNDEF; + font->pxMetrics.maxX = UNDEF; + font->pxMetrics.minX = UNDEF; + font->pxMetrics.maxY = UNDEF; + font->pxMetrics.minY = UNDEF; + font->pxMetrics.xHeight = UNDEF; + font->pxMetrics.capHeight = UNDEF; + font->pxMetrics.maxAwidth = UNDEF; + font->pxMetrics.awidth = UNDEF; + font->pxMetrics.ascent = UNDEF; + font->pxMetrics.descent = UNDEF; + font->pxMetrics.underlinePosition = UNDEF; + font->pxMetrics.underlineThickness = UNDEF; + font->metrics.height = UNDEF; + font->metrics.maxX = UNDEF; + font->metrics.minX = UNDEF; + font->metrics.maxY = UNDEF; + font->metrics.minY = UNDEF; + font->metrics.xHeight = UNDEF; + font->metrics.capHeight = UNDEF; + font->metrics.maxAwidth = UNDEF; + font->metrics.awidth = UNDEF; + font->metrics.ascent = UNDEF; + font->metrics.descent = UNDEF; + font->metrics.underlinePosition = UNDEF; + font->metrics.underlineThickness = UNDEF; font->foundry = makeName("UNKN"); font->strikes = NULL; return font; @@ -401,19 +425,12 @@ return STRIKE_BITMAP(strike, code); } -void -strikeMetrics(StrikePtr strike, - int *width_max_return, - int *x_min_return, int *y_min_return, - int *x_max_return, int *y_max_return) +int +strikeMaxWidth(StrikePtr strike) { BitmapPtr bitmap; int i; int width_max = 0; - int x_min = 10000; - int y_min = 10000; - int x_max = -10000; - int y_max = -10000; for(i = 0; i < FONT_CODES; i++) { bitmap = STRIKE_BITMAP(strike, i); @@ -421,21 +438,9 @@ continue; if(bitmap->advanceWidth > width_max) width_max = bitmap->advanceWidth; - if(bitmap->horiBearingX < x_min) - x_min = bitmap->horiBearingX; - if(bitmap->horiBearingY > y_max) - y_max = bitmap->horiBearingY; - if(bitmap->horiBearingX + bitmap->width > x_max) - x_max = bitmap->horiBearingX + bitmap->width; - if(bitmap->horiBearingY - bitmap->height < y_min) - y_min = bitmap->horiBearingY - bitmap->height; } - if(width_max_return) *width_max_return = width_max; - if(x_min_return) *x_min_return = x_min; - if(y_min_return) *y_min_return = y_min; - if(x_max_return) *x_max_return = x_max; - if(y_max_return) *y_max_return = y_max; + return width_max; } int @@ -453,7 +458,7 @@ if(bitmap) { if(width_return) *width_return = - (((float)bitmap->advanceWidth + 0.5) / strike->sizeX) * + (((float)bitmap->advanceWidth) / strike->sizeX) * TWO_SIXTEENTH; if(x_min_return) *x_min_return = @@ -463,17 +468,13 @@ *y_min_return = (((float)bitmap->horiBearingY - bitmap->height) / strike->sizeY) * TWO_SIXTEENTH; - /* For the following two, 0.9 instead of 0.5 might make - more sense. However, using different rounding rules - for x_max and awidth causes problems for detecting - charcell fonts. */ if(x_max_return) *x_max_return = - (((float)bitmap->horiBearingX + bitmap->width + 0.5) + (((float)bitmap->horiBearingX + bitmap->width) / strike->sizeX) * TWO_SIXTEENTH; if(y_max_return) *y_max_return = - (((float)bitmap->horiBearingY + 0.5) / strike->sizeY) * + (((float)bitmap->horiBearingY) / strike->sizeY) * TWO_SIXTEENTH; return 1; } @@ -482,33 +483,3 @@ return -1; } - -void -fontMetrics(FontPtr font, - int *max_awidth_return, - int *min_x_return, int *min_y_return, - int *max_x_return, int *max_y_return) -{ - int i, rc; - int max_awidth = 0; - int min_x = 10000 * 65536, min_y = 10000 * 65536; - int max_x = -10000 * 65536, max_y = -10000 * 65536; - for(i = 0; i < FONT_CODES; i++) { - int awidth, x0, y0, x1, y1; - rc = glyphMetrics(font, i, &awidth, &x0, &y0, &x1, &y1); - if(rc < 0) - continue; - if(awidth > max_awidth) - max_awidth = awidth; - if(x0 < min_x) min_x = x0; - if(y0 < min_y) min_y = y0; - if(x1 > max_x) max_x = x1; - if(y1 > max_y) max_y = y1; - } - if(max_awidth_return) *max_awidth_return = max_awidth; - if(min_x_return) *min_x_return = min_x; - if(min_y_return) *min_y_return = min_y; - if(max_x_return) *max_x_return = max_x; - if(max_y_return) *max_y_return = max_y; -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/util.c new/fonttosfnt-1.2.0/util.c --- old/fonttosfnt-1.1.0/util.c 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/util.c 2020-10-21 08:41:02.000000000 +0200 @@ -213,10 +213,10 @@ tm.tm_isdst = -1; macEpoch = mktime_gmt(&tm); - if(macEpoch < 0) return -1; + if(macEpoch == -1) return -1; current = time(NULL); - if(current < 0) + if(current == -1) return -1; if(current < macEpoch) { @@ -280,8 +280,11 @@ return makeName("URW "); else if(strcasecmp(prop.u.atom, "y&y") == 0) return makeName("Y&Y "); - else - return makeName("UNKN"); + else { + char buf[5]; + snprintf(buf, sizeof(buf), "%-4s", prop.u.atom); + return makeName(buf); + } } /* For now */ return makeName("UNKN"); @@ -302,7 +305,7 @@ else if(strcasecmp(prop.u.atom, "light") == 0) return 300; else if(strcasecmp(prop.u.atom, "medium") == 0) - return 500; + return 400; else if(strcasecmp(prop.u.atom, "semibold") == 0) return 600; else if(strcasecmp(prop.u.atom, "bold") == 0) @@ -312,9 +315,9 @@ else if(strcasecmp(prop.u.atom, "black") == 0) return 900; else - return 500; + return 400; } else - return 500; /* for now */ + return 400; /* for now */ } int @@ -388,6 +391,19 @@ return flags; } +int +faceIntProp(FT_Face face, const char *name) +{ + int rc; + BDF_PropertyRec prop; + + rc = FT_Get_BDF_Property(face, name, &prop); + if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER) + return prop.u.integer; + else + return UNDEF; +} + char * faceEncoding(FT_Face face) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonttosfnt-1.1.0/write.c new/fonttosfnt-1.2.0/write.c --- old/fonttosfnt-1.1.0/write.c 2020-01-06 03:57:50.000000000 +0100 +++ new/fonttosfnt-1.2.0/write.c 2020-10-21 08:41:02.000000000 +0200 @@ -61,7 +61,6 @@ static int writename(FILE*, FontPtr); static int writepost(FILE*, FontPtr); -int max_awidth, min_x, min_y, max_x, max_y; static CmapPtr current_cmap = NULL; static int numglyphs, nummetrics; static int write_error_occurred, read_error_occurred; @@ -206,6 +205,117 @@ return ntohl(val); } +void +fontMetrics(FontPtr font) +{ + int i, rc; + double sumAwidth = 0; + unsigned count = 0; + + font->metrics.maxAwidth = 0; + font->metrics.maxX = -10000 * TWO_SIXTEENTH; + font->metrics.maxY = -10000 * TWO_SIXTEENTH; + font->metrics.minX = 10000 * TWO_SIXTEENTH; + font->metrics.minY = 10000 * TWO_SIXTEENTH; + + for(i = 0; i < FONT_CODES; i++) { + int awidth, x0, y0, x1, y1; + rc = glyphMetrics(font, i, &awidth, &x0, &y0, &x1, &y1); + if(rc < 0) + continue; + + if(awidth > font->metrics.maxAwidth) font->metrics.maxAwidth = awidth; + if(x0 < font->metrics.minX) font->metrics.minX = x0; + if(y0 < font->metrics.minY) font->metrics.minY = y0; + if(x1 > font->metrics.maxX) font->metrics.maxX = x1; + if(y1 > font->metrics.maxY) font->metrics.maxY = y1; + + if(awidth > 0) { + sumAwidth += awidth; + count++; + } + } + + if (count) font->metrics.awidth = sumAwidth / count; + + font->metrics.height = TWO_SIXTEENTH; + + if(font->pxMetrics.size == UNDEF) { + font->pxMetrics.size = font->pxMetrics.height; + font->metrics.size = font->metrics.height; + } + + font->metrics.size = font->pxMetrics.size + * TWO_SIXTEENTH / font->pxMetrics.height; + + if(font->pxMetrics.ascent == UNDEF) { + font->metrics.ascent = font->metrics.maxY; + font->pxMetrics.ascent = + font->metrics.ascent + * font->pxMetrics.height / TWO_SIXTEENTH; + } + else + font->metrics.ascent = + font->pxMetrics.ascent + * TWO_SIXTEENTH / font->pxMetrics.height; + + if(font->pxMetrics.descent == UNDEF) { + font->metrics.descent = font->metrics.minY; + font->pxMetrics.descent = + font->metrics.descent + * font->pxMetrics.height / TWO_SIXTEENTH; + } + else + font->metrics.descent = + font->pxMetrics.descent + * TWO_SIXTEENTH / font->pxMetrics.height; + + if(font->pxMetrics.capHeight == UNDEF) { + if(glyphMetrics(font, 'X', NULL, NULL, NULL, NULL, &font->metrics.capHeight) != 1) + font->metrics.capHeight = font->metrics.ascent; + font->pxMetrics.capHeight = + font->metrics.capHeight * font->pxMetrics.height / TWO_SIXTEENTH; + } + else + font->metrics.capHeight = + font->pxMetrics.capHeight + * TWO_SIXTEENTH / font->pxMetrics.height; + + if(font->pxMetrics.xHeight == UNDEF) { + if(glyphMetrics(font, 'x', NULL, NULL, NULL, NULL, &font->metrics.xHeight) != 1) + font->metrics.xHeight = font->metrics.capHeight * 2 / 3; + font->pxMetrics.xHeight = + font->metrics.xHeight * font->pxMetrics.height / TWO_SIXTEENTH; + } + else + font->metrics.xHeight = + font->pxMetrics.xHeight + * TWO_SIXTEENTH / font->pxMetrics.height; + + if(font->pxMetrics.underlinePosition == UNDEF) + font->metrics.underlinePosition = - font->metrics.descent * 2; + else { + fprintf(stderr, "Setting underlinePosition. pxMetrics.underlinePosition is %d. height is %d\n", + font->pxMetrics.underlinePosition, font->pxMetrics.height); + font->metrics.underlinePosition = + font->pxMetrics.underlinePosition + * TWO_SIXTEENTH / font->pxMetrics.height; + } + + if(font->pxMetrics.underlineThickness == UNDEF) + /* make sure thickness is at least one pixel. */ + /* TODO: this could be refined according to + * X Logical Font Description Conventions (xlfd.txt) + * by also considering the font weight. */ + font->metrics.underlineThickness = + TWO_SIXTEENTH + / (font->pxMetrics.height < 9 ? font->pxMetrics.height : 9); + else + font->metrics.underlineThickness = + font->pxMetrics.underlineThickness + * TWO_SIXTEENTH / font->pxMetrics.height; +} + int writeFile(char *filename, FontPtr font) { @@ -219,8 +329,6 @@ int offset[15], length[15]; StrikePtr strike; - fontMetrics(font, &max_awidth, &min_x, &min_y, &max_x, &max_y); - out = fopen(filename, "wb+"); if(out == NULL) return -1; @@ -231,6 +339,8 @@ return -1; } + fontMetrics(font); + write_error_occurred = 0; read_error_occurred = 0; @@ -434,8 +544,8 @@ static int writehead(FILE* out, FontPtr font) { - int time_hi; - unsigned time_lo; + int time_hi = 0; + unsigned time_lo = 0; macTime(&time_hi, &time_lo); @@ -451,10 +561,12 @@ writeLONG(out, time_hi); /* modified */ writeULONG(out, time_lo); - writeUSHORT(out, FONT_UNITS_FLOOR(min_x)); - writeUSHORT(out, FONT_UNITS_FLOOR(min_y)); - writeUSHORT(out, FONT_UNITS_CEIL(max_x)); - writeUSHORT(out, FONT_UNITS_CEIL(max_y)); + /* bounding box for all glyphs */ + writeUSHORT(out, FONT_UNITS_FLOOR(font->metrics.minX)); + writeUSHORT(out, FONT_UNITS_FLOOR(font->metrics.minY)); + writeUSHORT(out, FONT_UNITS_CEIL(font->metrics.maxX)); + writeUSHORT(out, FONT_UNITS_CEIL(font->metrics.maxY)); + writeUSHORT(out, font->flags); /* macStyle */ writeUSHORT(out, 1); /* lowestRecPPEM */ writeSHORT(out, 0); /* fontDirectionHint */ @@ -549,27 +661,6 @@ return 0; } -static int -writeSbitLineMetrics(FILE *out, StrikePtr strike, int num, int den) -{ - int width_max, x_min, y_min, x_max, y_max; - strikeMetrics(strike, &width_max, &x_min, &y_min, &x_max, &y_max); - - writeCHAR(out, y_max); /* ascender */ - writeCHAR(out, y_min); /* descender */ - writeBYTE(out, width_max); /* widthMax */ - writeCHAR(out, num); /* caretSlopeNumerator */ - writeCHAR(out, den); /* caretSlopeDenominator */ - writeCHAR(out, 0); /* caretOffset */ - writeCHAR(out, 0); /* minOriginSB */ - writeCHAR(out, 0); /* minAdvanceSB */ - writeCHAR(out, 0); /* maxBeforeBL */ - writeCHAR(out, 0); /* minAfterBL */ - writeCHAR(out, 0); /* pad1 */ - writeCHAR(out, 0); /* pad2 */ - return 0; -} - static int writeEBLC(FILE* out, FontPtr font) { @@ -599,8 +690,20 @@ writeULONG(out, 0xDEADFACE); /* indexTablesSize */ writeULONG(out, 0xDEADFACE); /* numberOfIndexSubTables */ writeULONG(out, 0); /* colorRef */ - writeSbitLineMetrics(out, strike, num, den); - writeSbitLineMetrics(out, strike, num, den); + for (i = 0; i <= 1; i++) { + writeCHAR(out, font->pxMetrics.ascent); /* ascender */ + writeCHAR(out, -font->pxMetrics.descent); /* descender */ + writeBYTE(out, strikeMaxWidth(strike)); /* widthMax */ + writeCHAR(out, num); /* caretSlopeNumerator */ + writeCHAR(out, den); /* caretSlopeDenominator */ + writeCHAR(out, 0); /* caretOffset */ + writeCHAR(out, 0); /* minOriginSB */ + writeCHAR(out, 0); /* minAdvanceSB */ + writeCHAR(out, 0); /* maxBeforeBL */ + writeCHAR(out, 0); /* minAfterBL */ + writeCHAR(out, 0); /* pad1 */ + writeCHAR(out, 0); /* pad2 */ + } writeUSHORT(out, 0); /* startGlyphIndex */ writeUSHORT(out, 0xFFFD); /* endGlyphIndex */ writeBYTE(out, strike->sizeX); /* ppemX */ @@ -648,9 +751,6 @@ /* actual indexSubTables */ strike = font->strikes; while(strike) { - int vertAdvance, y_min, y_max; - strikeMetrics(strike, NULL, NULL, &y_min, NULL, &y_max); - vertAdvance = y_max - y_min; table = strike->indexSubTables; while(table) { int location; @@ -718,7 +818,7 @@ writeBYTE(out, bitmap->advanceWidth); writeCHAR(out, bitmap->horiBearingX); /* vertBearingX */ writeCHAR(out, bitmap->horiBearingY); /* vertBearingY */ - writeBYTE(out, vertAdvance); /* vertAdvance */ + writeBYTE(out, font->metrics.maxAwidth); /* vertAdvance */ } else { for(i = table->firstGlyphIndex; i <= table->lastGlyphIndex; i++) { @@ -849,13 +949,15 @@ degreesToFraction(font->italicAngle, &num, &den); writeULONG(out, 0x00010000); /* version */ - writeSHORT(out, FONT_UNITS_CEIL(max_y)); /* ascender */ - writeSHORT(out, FONT_UNITS_FLOOR(min_y)); /* descender */ - writeSHORT(out, FONT_UNITS(TWO_SIXTEENTH / 20)); /* lineGap */ - writeUSHORT(out, FONT_UNITS(max_awidth)); /* advanceWidthMax */ - writeSHORT(out, FONT_UNITS_FLOOR(min_x)); /* minLeftSideBearing */ - writeSHORT(out, FONT_UNITS_FLOOR(min_x)); /* minRightSideBearing */ - writeSHORT(out, FONT_UNITS_CEIL(max_x)); /* xMaxExtent */ + writeSHORT(out, FONT_UNITS_CEIL(font->metrics.ascent)); /* ascender */ + writeSHORT(out, -FONT_UNITS_CEIL(font->metrics.descent)); /* descender */ + writeSHORT(out, FONT_UNITS(font->metrics.size - font->metrics.ascent - font->metrics.descent)); /* lineGap */ + writeUSHORT(out, FONT_UNITS(font->metrics.maxAwidth)); /* advanceWidthMax */ + /* TODO: the next three are not calculated according to spec, are they ? + * https://docs.microsoft.com/en-us/typography/opentype/spec/hhea */ + writeSHORT(out, FONT_UNITS_FLOOR(font->metrics.minX)); /* minLeftSideBearing */ + writeSHORT(out, FONT_UNITS_FLOOR(font->metrics.minX)); /* minRightSideBearing */ + writeSHORT(out, FONT_UNITS_CEIL(font->metrics.maxX)); /* xMaxExtent */ writeSHORT(out, den); /* caretSlopeRise */ writeSHORT(out, num); /* caretSlopeRun */ writeSHORT(out, 0); /* reserved */ @@ -974,8 +1076,8 @@ writeULONG(out, 0x00030000); /* FormatType */ writeULONG(out, font->italicAngle); /* italicAngle */ - writeSHORT(out, FONT_UNITS(font->underlinePosition)); - writeSHORT(out, FONT_UNITS(font->underlineThickness)); + writeSHORT(out, FONT_UNITS(font->metrics.underlinePosition)); + writeSHORT(out, FONT_UNITS(font->metrics.underlineThickness)); writeULONG(out, fixed_pitch); /* isFixedPitch */ writeULONG(out, 0); /* minMemType42 */ writeULONG(out, 0); /* maxMemType42 */ @@ -989,8 +1091,8 @@ { int i; - writeUSHORT(out, 0x0001); - writeSHORT(out, FONT_UNITS(max_awidth / 2)); /* xAvgCharWidth; */ + writeUSHORT(out, 5); /* version */ + writeSHORT(out, FONT_UNITS(font->metrics.awidth)); /* xAvgCharWidth; */ writeUSHORT(out, font->weight); /* usWeightClass; */ writeUSHORT(out, font->width); /* usWidthClass; */ writeSHORT(out, 0); /* fsType; */ @@ -1002,7 +1104,7 @@ writeSHORT(out, UNITS_PER_EM / 5); /* ySuperscriptYSize; */ writeSHORT(out, 0); /* ySuperscriptXOffset; */ writeSHORT(out, UNITS_PER_EM / 5); /* ySuperscriptYOffset; */ - writeSHORT(out, FONT_UNITS(font->underlineThickness)); + writeSHORT(out, FONT_UNITS(font->metrics.underlineThickness)); /* yStrikeoutSize; */ writeSHORT(out, UNITS_PER_EM / 4); /* yStrikeoutPosition; */ writeSHORT(out, 0); /* sFamilyClass; */ @@ -1013,17 +1115,38 @@ writeULONG(out, 0x03FF); /* ulUnicodeRange3; */ writeULONG(out, 0U); /* ulUnicodeRange4; */ writeULONG(out, font->foundry); /* achVendID[4]; */ - writeUSHORT(out, 0x0040); /* fsSelection; */ + i = 0; + if (font->flags & FACE_ITALIC) + i |= 1 << 0; + if (font->flags & FACE_BOLD) + i |= 1 << 5; + if (!i) + i |= 1 << 6; +#ifndef NO_TYPO_METRICS + i |= 1 << 7; /* USE_TYPO_METRICS instead usWin metrics for line spacing. */ +#endif + writeUSHORT(out, i); /* fsSelection; */ writeUSHORT(out, 0x20); /* usFirstCharIndex; */ writeUSHORT(out, 0xFFFD); /* usLastCharIndex; */ - writeUSHORT(out, FONT_UNITS_CEIL(max_y)); /* sTypoAscender; */ - writeUSHORT(out, -FONT_UNITS_FLOOR(min_y)); /* sTypoDescender; */ - writeUSHORT(out, FONT_UNITS(max_y - min_y)); - /* sTypoLineGap; */ - writeUSHORT(out, FONT_UNITS_CEIL(max_y)); /* usWinAscent; */ - writeUSHORT(out, -FONT_UNITS_FLOOR(min_y)); /* usWinDescent; */ - writeULONG(out, 3); /* ulCodePageRange1; */ - writeULONG(out, 0); /* ulCodePageRange2; */ + writeUSHORT(out, FONT_UNITS_CEIL(font->metrics.ascent)); /* sTypoAscender; */ + writeSHORT(out, -FONT_UNITS_CEIL(font->metrics.descent)); /* sTypoDescender; */ + writeSHORT(out, FONT_UNITS(font->metrics.size - font->metrics.ascent - font->metrics.descent)); /* sTypoLineGap */ +#ifdef NO_TYPO_METRICS + writeUSHORT(out, FONT_UNITS_CEIL(font->metrics.ascent)); /* usWinAscent; */ + writeUSHORT(out, FONT_UNITS_CEIL(font->metrics.descent)); /* usWinDescent; */ +#else + writeUSHORT(out, FONT_UNITS_CEIL(font->metrics.maxY)); /* usWinAscent; */ + writeUSHORT(out, -FONT_UNITS_FLOOR(font->metrics.minY)); /* usWinDescent; */ +#endif + writeULONG(out, 3); /* ulCodePageRange1; */ + writeULONG(out, 0); /* ulCodePageRange2; */ + writeSHORT(out, FONT_UNITS_CEIL(font->metrics.xHeight)); /* sxHeight; */ + writeSHORT(out, FONT_UNITS_CEIL(font->metrics.capHeight)); /* sCapHeight; */ + writeUSHORT(out, 0); /* usDefaultChar; */ + writeUSHORT(out, 20); /* usBreakChar; */ + writeUSHORT(out, 0); /* usMaxContext; */ + writeUSHORT(out, 0); /* usLowerOpticalPointSize; */ + writeUSHORT(out, 0xffff); /* usUpperOpticalPointSize; */ return 0; } @@ -1061,11 +1184,11 @@ writeULONG(out, 0x00010000); /* version */ writeULONG(out, 0); /* FontNumber */ - writeUSHORT(out, FONT_UNITS(max_awidth)); /* pitch */ - writeUSHORT(out, FONT_UNITS(max_y)); /* xHeight */ + writeUSHORT(out, FONT_UNITS(font->metrics.maxAwidth)); /* pitch */ + writeUSHORT(out, FONT_UNITS(font->metrics.xHeight)); /* xHeight */ writeUSHORT(out, style); /* style */ writeUSHORT(out, 6 << 12); /* TypeFamily */ - writeUSHORT(out, FONT_UNITS(max_y)); /* CapHeight */ + writeUSHORT(out, FONT_UNITS(font->metrics.xHeight)); /* CapHeight */ writeUSHORT(out, 0); /* SymbolSet */ writeCHARs(out, name, 16); /* TypeFace */ writeBYTEs(out, charComplement, 8); /* CharacterComplement */
