--- vflib3-3.6.14.dfsg.orig/debian/README.Debian +++ vflib3-3.6.14.dfsg/debian/README.Debian @@ -0,0 +1,26 @@ +vflib3 for Debian +----------------- + +Major differences between VFlib 3.x and VFlib 2.x + + VFlib 2.x was designed only for Japanese Kanji fonts + VFlib 3.6 has been multi-lingualized, so it can handle not only + Japanese Kanji fonts but also fonts for other languages + (e.g. Korean). + + Concept of font metrics is introduced in VFlib 3.6 + VFlib 2.x does not have the concept of font metrics since it assumes all + characters have the same metrics. Font metrics is introduced in + VFlib 3.6 and proportional fonts can be used now. + + Syntax of vflibcap file has been changed + The syntax of vflibcap file is massively revised. VFlib 2.x adopted + termcap-like notation, but now VFlib 3.6 adopts lisp-like + notation. + + Arguments and return values of functions have been changed + In VFlib 2.x, bitmaps of characters are written in a frame buffer + which is given by an argument. But in VFlib 3.6, a bitmap object + is returned. + + -- Masayuki Hatta , Sun, 8 Jul 2001 16:10:42 +0900 --- vflib3-3.6.14.dfsg.orig/debian/TODO +++ vflib3-3.6.14.dfsg/debian/TODO @@ -0,0 +1 @@ +o write manuals for programs in vflib3-bin. --- vflib3-3.6.14.dfsg.orig/debian/changelog +++ vflib3-3.6.14.dfsg/debian/changelog @@ -0,0 +1,341 @@ +vflib3 (3.6.14.dfsg-3+nmu2) unstable; urgency=medium + + * Non-maintainer upload. + * Add libxext-dev build dependency (closes: #742093). + + -- Michael Gilbert Fri, 21 Mar 2014 04:59:28 +0000 + +vflib3 (3.6.14.dfsg-3+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove support for t1lib (closes: #638756). + + -- Michael Gilbert Sun, 09 Mar 2014 21:37:52 +0000 + +vflib3 (3.6.14.dfsg-3) unstable; urgency=low + + * Remove RPATH from the generated library. (lintian) + - debian/control: Add Build-dependency on chrpath. + * Delete postinst and prerm from vflib3-doc. + + -- OHURA Makoto Fri, 16 Dec 2011 11:39:37 +0900 + +vflib3 (3.6.14.dfsg-2) unstable; urgency=low + + * Use debhelper version 5 instead of version 4. + * debian/patches/09_avoid_segfault_at_vflmklib.c.dpatch: Add new patch. + Avoid segfault at vflmk utilities. + * Remove dependency on defoma (Closes: #542338). + + -- OHURA Makoto Thu, 15 Dec 2011 23:44:43 +0900 + +vflib3 (3.6.14.dfsg-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS on GNU/kFreeBSD by tweaking ltconfig as suggested by Petr + Salinger (Closes: #493125). Introduce the following patch for that: + - debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch + + -- Cyril Brulebois Thu, 02 Jul 2009 03:20:53 +0200 + +vflib3 (3.6.14.dfsg-1) unstable; urgency=low + + * Remove ccv/TBL/RFC/rfc1489.txt, which is a non-free file. + (Closes: #464433) + * debian/patches/06_strdup_implicit_pointer_conversion.dpatch: New + patch. Add -D_GNU_SOURCE to CFLAGS to enable prototype definition + of strdup(3). (Closes: #464465) + * debian/rules: + - Add autoconf2.13 before executing configure script. + - Run configure script with FreeType2. + - Move DH_COMPAT variable to debian/compat. + - Don't ignore make clean error. + * debian/control: + - Add autoconf2.13 and libfreetype6-dev to Build-Depends: field. + - Add xutils-dev to Build-Depends: field for xmkmf. + (Closes: #484200, #485224) + - Remove x-dev and xutils from Build-Depends: field. + * debian/patches/04_not_ln_parent_dir.dpatch: New patch. Don't make a + symlink at parent directory. + * Remove unused debian patch. + * debian/patches/07_build_with_freetype2.dpatch: New patch. Build with + FreeType2 library. (Closes: #431779, #431781) + + -- OHURA Makoto Thu, 12 Jun 2008 23:08:47 +0900 + +vflib3 (3.6.14-1) unstable; urgency=low + + * New upstream release. + - Disable two patches, 01_build_fix_for_gcc_3.3 and 02_GetNoFonts. + * debian/control: New Maintainer. (Closes: #393580) + + -- OHURA Makoto Tue, 05 Feb 2008 23:13:44 +0900 + +vflib3 (3.6.13.dfsg-1) unstable; urgency=low + + * QA upload. + * Remove the non-free ccv/TBL/RFC/rfc1489.txt from the upstream tarball. + Closes: #393418. + * debian/update-vflibcap: Fix redirection. Thanks to Yoshinori Ariie for + the patch. Closes: #284919. + * debian/vflib3.defoma: Handle undefined hints. Closes: #147861, #306442. + * debian/patches/05_mkt1enc_syntax_error.dpatch: Fix unterminated quote in + t1lib/mkt1enc.sh. + * Remove awk from Build-Depends since it's depended on by base-files (i.e. + effectively essential). + * debian/changelog: Remove obsolete Emacs local variables. + * debian/rules: + - Remove config.{sub,guess} on clean to make for a leaner diff. + - Remove calls to dh_undocumented. + + -- Matej Vela Sat, 28 Oct 2006 12:16:06 +0200 + +vflib3 (3.6.13-4) unstable; urgency=low + + * Orphaning this package. + + -- Masayuki Hatta (mhatta) Tue, 17 Oct 2006 06:32:18 +0900 + +vflib3 (3.6.13-3.6) unstable; urgency=low + + * Non-maintainer upload to fix writing outside the build directory. + * Added debian/patches/04_fix_configure_not_ln_pwd.dpatch, that fixes the + linking loop in configure so that the parent directory is not linked. + (Closes: #381624) + * Fixed debian/rules to comply with policy: + - CFLAGS = -g -Wall always used + - noopt is honored. + * Fixed debian/rules so that the binary-indep package is generated in the + binary-indep rule. (Closes: #207196) + + -- Margarita Manterola Sun, 13 Aug 2006 13:13:52 -0300 + +vflib3 (3.6.13-3.5) unstable; urgency=medium + + * Non-maintainer upload. + * Make vflib3-dev depend on libkpathsea-dev. Closes: #378447. + * Fix `comparison is always false' warnings on platforms where char + is unsigned by default. Closes: #170529. + + -- Matej Vela Sun, 23 Jul 2006 18:59:19 +0200 + +vflib3 (3.6.13-3.4) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Make vflib3-dev depend on libttf-dev and libt1-dev; otherwise + libtool-using software fails to build with vflib3-dev due to + dangling references to missing .la files. (Closes: #361944). + + -- Luk Claes Mon, 17 Apr 2006 10:55:43 +0200 + +vflib3 (3.6.13-3.3) unstable; urgency=low + + * Non-maintainer upload. + * Replace build-dependency on xlibs-dev with an explicit build-dependency + on each required package. (Closes: #346906) + + -- Steinar H. Gunderson Sat, 21 Jan 2006 03:14:17 +0100 + +vflib3 (3.6.13-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Disable -ansi CFLAG, which causes prototypes of some used functions to + be undeclared. Closes: #316112 + + -- dann frazier Fri, 16 Sep 2005 16:07:47 -0600 + +vflib3 (3.6.13-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend against libt1-dev instead of the obsoleted t1lib-dev. + Closes: #251184. + * Change reference to T1_Get_no_fonts to T1_GetNoFonts + + -- Steve Langasek Wed, 22 Jun 2005 21:29:05 -0700 + +vflib3 (3.6.13-3) unstable; urgency=low + + * Now check whether /var/lib/defoma/vflib3.d exists - closes: #179714 + + -- Masayuki Hatta (mhatta) Sat, 14 Feb 2004 17:51:41 +0900 + +vflib3 (3.6.13-2) unstable; urgency=low + + * Maintainer upload. + * Now uses dpatch. + * Bumped up Standards-Version to 3.6.1. + * [control] changed Maintainer field. + * Acknowledged NMUs - closes: #197262 + * Updated libtool scripts - closes: #201932, #206910 + + -- Masayuki Hatta (mhatta) Mon, 9 Feb 2004 13:39:46 +0900 + +vflib3 (3.6.13-1.1) unstable; urgency=low + + * Non-maintainer upload according to the release manager's plan. + * Fixed building by removing reference to varargs.h - closes: #197262 + + -- Roland Mas Sat, 23 Aug 2003 17:26:40 +0200 + +vflib3 (3.6.13-1) unstable; urgency=low + + * New upstream release(including Dan Elphick's fix) - closes: #167132 + * Bumped to Standards-Version: 3.5.7. + * Suppress warning from update-vflib - closes: #163256 + * Remove /etc/vflib3 on purge - closes: #163274 + + -- Masayuki Hatta Tue, 5 Nov 2002 09:56:43 +0900 + +vflib3 (3.6.12-3) unstable; urgency=low + + * Fixed vflib3.defoma - closes: #143087 + + -- Masayuki Hatta Wed, 22 May 2002 14:50:26 +0900 + +vflib3 (3.6.12-2) unstable; urgency=low + + * Added preliminary defoma support. Well, I know it's quite broken, but + at least should work with Kochi-* fonts - closes: #136892 + * Added Build-Depends: autotools-dev. config.{guess,sub} are now + updated from /usr/share/misc at build time. + + -- Masayuki Hatta Mon, 15 Apr 2002 12:10:24 +0900 + +vflib3 (3.6.12-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Sat, 3 Nov 2001 10:30:14 +0900 + +vflib3 (3.6.11-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Thu, 4 Oct 2001 10:55:59 +0900 + +vflib3 (3.6.10-2) unstable; urgency=low + + * Removed --with-gettext-prefix. + + -- Masayuki Hatta Tue, 10 Jul 2001 01:05:24 +0900 + +vflib3 (3.6.10-1) unstable; urgency=low + + * New upstream release. + * Updated to Standards-Version: 3.5.2. + * Now uses debhelper V3. + * Updated config.{sub,guess} - closes: #103637 + * Added Suggests: watanabe-vfont & asiya24-vfont. Also tweaked + vflibcap* for them. + + -- Masayuki Hatta Sun, 8 Jul 2001 16:10:42 +0900 + +vflib3 (3.6.9-3) unstable; urgency=low + + * Added xutils to Build-Depends - closes: #90680 + + -- Masayuki Hatta Thu, 26 Apr 2001 00:16:32 +0900 + +vflib3 (3.6.9-2) unstable; urgency=low + + * Fixed Build-Depends. + + -- Masayuki Hatta Wed, 20 Dec 2000 19:15:41 +0900 + +vflib3 (3.6.9-1) unstable; urgency=low + + * New upstream release + * Built with libkpathsea3 - Closes: #79804 + + -- Masayuki Hatta Wed, 20 Dec 2000 10:20:11 +0900 + +vflib3 (3.6.8-2) unstable; urgency=low + + * New Debian Maintainer Upload. I'd like to thank my sponsor and AM + Fumitoshi UKAI . + * Added Build-Depends: debhelper - Closes: #66931 + * Integrated with local hack by Masato Taruishi . + Now this package employs sophisticated way to handle + /etc/vflib3/vflibcap (i.e. uses update-vflibcap script). Thanks taru! + * Revised Description. Now it's lintian-free! + + -- Masayuki Hatta Sun, 8 Oct 2000 20:55:52 +0900 + +vflib3 (3.6.8-1.7) unstable; urgency=low + + * and more fixed of no such file or directory. + add the directory to vflib3.dirs. + + -- Masato Taruishi Wed, 30 Aug 2000 17:03:18 +0900 + +vflib3 (3.6.8-1.6) unstable; urgency=low + + * Fixed no such file or directory in update-vflibcap. + + -- Masato Taruishi Wed, 30 Aug 2000 15:05:14 +0900 + +vflib3 (3.6.8-1.5) unstable; urgency=low + + * Changed update-vflibcap. + + -- Masato Taruishi Wed, 30 Aug 2000 14:09:17 +0900 + +vflib3 (3.6.8-1.4) unstable; urgency=low + + * Applied a change of debian-vfont to macro. + + -- Masato Taruishi Wed, 30 Aug 2000 03:34:24 +0900 + +vflib3 (3.6.8-1.3) unstable; urgency=low + + * Changed debian vfont names of mincho and gothic. + + -- Masato Taruishi Wed, 30 Aug 2000 02:58:44 +0900 + +vflib3 (3.6.8-1.2) unstable; urgency=low + + * Added a symlink /etc/vflib3/vflibcap-tex to vflibcap + for tex-guy's default setteing. + NOTE: should be in tex-guy's package itself? + * Modified /etc/vflib3/vflibcaps/00vflib3 for Debian vfont policy. + + -- Masato Taruishi Wed, 30 Aug 2000 01:02:03 +0900 + +vflib3 (3.6.8-1.1) unstable; urgency=low + + * Added update-vflibcap. + - Changed vflibcap update method. + * Moved vflibcap-* as example files. + + -- Masato Taruishi Tue, 29 Aug 2000 18:48:14 +0900 + +vflib3 (3.6.8-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Fri, 23 Jun 2000 17:25:13 +0900 + +vflib3 (3.6.7-2) unstable; urgency=low + + * Fixed shlibs.local. + + -- Masayuki Hatta Sun, 23 Apr 2000 08:42:31 +0900 + +vflib3 (3.6.7-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Thu, 6 Apr 2000 01:38:38 +0900 + +vflib3 (3.6.6-1) unstable; urgency=low + + * New upstream release + + -- Masayuki Hatta Tue, 8 Feb 2000 23:35:31 +0900 + +vflib3 (3.6.5-1) unstable; urgency=low + + * Initial Release for Debian Project. + + -- Masayuki Hatta Sun, 30 Jan 2000 16:29:34 +0900 --- vflib3-3.6.14.dfsg.orig/debian/compat +++ vflib3-3.6.14.dfsg/debian/compat @@ -0,0 +1 @@ +5 --- vflib3-3.6.14.dfsg.orig/debian/control +++ vflib3-3.6.14.dfsg/debian/control @@ -0,0 +1,75 @@ +Source: vflib3 +Section: devel +Priority: optional +Maintainer: OHURA Makoto +Build-Depends: autotools-dev, chrpath, debhelper (>> 5.0.0), dpatch, gettext, libfreetype6-dev, libkpathsea-dev, libx11-dev, autoconf2.13, xutils-dev, libxext-dev +Standards-Version: 3.7.2 + +Package: vflib3-dev +Section: libdevel +Architecture: any +Depends: vflib3 (= ${Source-Version}), libfreetype6-dev, libkpathsea-dev, libc6-dev +Description: Development files for VFlib3 + VFlib3 is a font rasterizer library for multi-lingual information + processing. Using VFlib3, you can obtain bitmap data of characters(glyphs) + from various fonts in a unified manner. + . + VFlib3 can handle almost all font formats available - it now supports + PK, GF, VF, TFM, OFM level 0, OVF, PCF, BDF, HBF, Syotai-Club, JG, eKanji + and more. TrueType and Type 1 fonts are also supported via FreeType2. + Font search via kpathsea is supported, too. + . + This package contains the header file and static library for developing + with VFlib3. + +Package: vflib3-bin +Section: devel +Architecture: any +Depends: ${shlibs:Depends} +Description: Sample programs using VFlib3 + VFlib3 is a font rasterizer library for multi-lingual information + processing. Using VFlib3, you can obtain bitmap data of characters(glyphs) + from various fonts in a unified manner. + . + VFlib3 can handle almost all font formats available - it now supports + PK, GF, VF, TFM, OFM level 0, OVF, PCF, BDF, HBF, Syotai-Club, JG, eKanji + and more. TrueType and Type 1 fonts are also supported via FreeType2. + Font search via kpathsea is supported, too. + . + This package contains a few sample programs that come with VFlib3. + +Package: vflib3-doc +Section: doc +Architecture: all +Recommends: www-browser, postscript-viewer, info-browser +Suggests: vflib3 +Description: Documentation for VFlib3 + VFlib3 is a font rasterizer library for multi-lingual information + processing. Using VFlib3, you can obtain bitmap data of characters(glyphs) + from various fonts in a unified manner. + . + VFlib3 can handle almost all font formats available - it now supports + PK, GF, VF, TFM, OFM level 0, OVF, PCF, BDF, HBF, Syotai-Club, JG, eKanji + and more. TrueType and Type 1 fonts are also supported via FreeType2. + Font search via kpathsea is supported, too. + . + This package contains the VFlib3 documentation in various formats. + +Package: vflib3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: watanabe-vfont (<< 1-6.6), asiya24-vfont (<< 1-6.6) +Suggests: watanabe-vfont (>> 1-6.6), asiya24-vfont (>> 1-6.6) +Description: Versatile Font Library + VFlib3 is a font rasterizer library for multi-lingual information + processing. Using VFlib3, you can obtain bitmap data of characters(glyphs) + from various fonts in a unified manner. + . + VFlib3 can handle almost all font formats available - it now supports + PK, GF, VF, TFM, OFM level 0, OVF, PCF, BDF, HBF, Syotai-Club, JG, eKanji + and more. TrueType and Type 1 fonts are also supported via FreeType2. + Font search via kpathsea is supported, too. + . + This package contains the shared library and configuration files + needed to run programs using VFlib3. --- vflib3-3.6.14.dfsg.orig/debian/copyright +++ vflib3-3.6.14.dfsg/debian/copyright @@ -0,0 +1,19 @@ +This package was debianized by Masayuki Hatta on +Sun, 8 Jul 2001 16:10:42 +0900. + +It was downloaded from + ftp://TypeHack.aial.hiroshima-u.ac.jp/pub/TypeHack/ + +Upstream Author: Hirotsugu Kakugawa + +Copyright: + +* The VFlib library is distributed under the terms of GNU Library General + Public License. + +* Programs, documents and any other files (except those with explicit + description) are distributed under the terms of GNU General Public + License. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. --- vflib3-3.6.14.dfsg.orig/debian/patches/00list +++ vflib3-3.6.14.dfsg/debian/patches/00list @@ -0,0 +1,10 @@ +#01_build_fix_for_gcc_3.3 +#02_GetNoFonts +03_comparison_always_false +#04_fix_configure_not_ln_pwd +04_not_ln_parent_dir +05_mkt1enc_syntax_error +06_strdup_implicit_pointer_conversion +07_build_with_freetype2 +08_fix_ftbfs_on_kfreebsd.dpatch +09_avoid_segfault_at_vflmklib.c --- vflib3-3.6.14.dfsg.orig/debian/patches/01_build_fix_for_gcc_3.3.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/01_build_fix_for_gcc_3.3.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh -e +## 01_build_fix_for_gcc_3.3.dpatch by Masayuki Hatta +## +## All lines beginning with \`## DP:' are a description of the patch. +## DP: Build fix for gcc-3.3. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0 +;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + + +diff -urN vflib3-3.6.13.orig/src/vfldisol.c vflib3-3.6.13/src/vfldisol.c +--- vflib3-3.6.13.orig/src/vfldisol.c 2004-02-09 13:46:49.000000000 +0900 ++++ vflib3-3.6.13/src/vfldisol.c 2004-02-09 13:47:11.000000000 +0900 +@@ -30,7 +30,6 @@ + + #include + #include +-#include + #include "VFlib-3_6.h" + + #define CommentLine printf --- vflib3-3.6.14.dfsg.orig/debian/patches/02_GetNoFonts.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/02_GetNoFonts.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_GetNoFonts.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Build fix for libt1-dev + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0 + ;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +diff -urN vflib-3.6.13.orig/src/drv_t1.c vflib-3.6.13/src/drv_t1.c +--- vflib3-3.6.13.orig/src/drv_t1.c ++++ vflib3-3.6.13/src/drv_t1.c +@@ -934,7 +934,7 @@ + ps = 0.0 - ps; + + if ((last_dpix != dpix) || (last_dpiy != dpiy)){ +- for (i = 0; i < T1_Get_no_fonts(); i++) ++ for (i = 0; i < T1_GetNoFonts(); i++) + T1_DeleteAllSizes(i); + if (T1_SetDeviceResolutions((float)dpix, (float)dpiy) < 0){ + last_dpix = LASTVAL_NONE; --- vflib3-3.6.14.dfsg.orig/debian/patches/03_comparison_always_false.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/03_comparison_always_false.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_comparison_always_false.dpatch by Matej Vela +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix `comparison is always false' warnings on platforms where char +## DP: is unsigned by default (this might lead to infinite loops). + +@DPATCH@ +diff -urNad vflib3-3.6.13~/src/sexp.c vflib3-3.6.13/src/sexp.c +--- vflib3-3.6.13~/src/sexp.c ++++ vflib3-3.6.13/src/sexp.c +@@ -707,7 +707,7 @@ + + + static int vf_sexp_do_read_from_stream(SEXP_STREAM stream, SEXP sexp); +-static int vf_sexp_read_str(SEXP_STREAM stream, char ch, SEXP sexp); ++static int vf_sexp_read_str(SEXP_STREAM stream, int ch, SEXP sexp); + static int vf_sexp_skip(SEXP_STREAM stream); + static char vf_get_char_esc(char **pp, SEXP_STREAM stream); + #define NBUFFER_MIN 2*1024 +@@ -787,7 +787,7 @@ + } + + static int +-vf_sexp_read_str(SEXP_STREAM stream, char ch, SEXP s) ++vf_sexp_read_str(SEXP_STREAM stream, int ch, SEXP s) + { + char tmp[8]; + int ch1, dq_str; --- vflib3-3.6.14.dfsg.orig/debian/patches/04_fix_configure_not_ln_pwd.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/04_fix_configure_not_ln_pwd.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_fix_configure_not_ln_pwd.dpatch by Margarita Manterola +## +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the ln loop, so that it does not try to link the parent dir. + +@DPATCH@ +--- vflib3-3.6.13/configure 2006-08-13 12:21:31.000000000 -0300 ++++ vflib3-marga/configure 2006-08-13 12:18:50.444197987 -0300 +@@ -935,6 +935,9 @@ + + working_dir=`pwd` + for curr_dir in `find $working_dir -type d -print`; do ++ if test $curr_dir = $working_dir; then ++ continue ++ fi + new_dir=`echo $curr_dir | sed -e 's|^\(.*\)-[0-9.][0-9.]*$|\1|'` + if test $curr_dir != $new_dir; then + r_curr_dir=`echo $curr_dir | sed -e "s|$working_dir/||"` --- vflib3-3.6.14.dfsg.orig/debian/patches/04_not_ln_parent_dir.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/04_not_ln_parent_dir.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_not_ln_parent_dir.dpatch by OHURA Makoto +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't make a symlink at parent directory. +## DP: See Bug#381624 + +@DPATCH@ +diff -urNad vflib3-3.6.14.dfsg~/aclocal.m4 vflib3-3.6.14.dfsg/aclocal.m4 +--- vflib3-3.6.14.dfsg~/aclocal.m4 2008-02-05 20:38:37.000000000 +0900 ++++ vflib3-3.6.14.dfsg/aclocal.m4 2008-02-12 23:48:44.000000000 +0900 +@@ -13,6 +13,9 @@ + changequote(<, >)dnl + working_dir=`pwd` + for curr_dir in `find $working_dir -type d -print`; do ++ if test $curr_dir = $working_dir; then ++ continue ++ fi + new_dir=`echo $curr_dir | sed -e 's|^\(.*\)-[0-9.][0-9.]*$|\1|'` + if test $curr_dir != $new_dir; then + r_curr_dir=`echo $curr_dir | sed -e "s|$working_dir/||"` --- vflib3-3.6.14.dfsg.orig/debian/patches/05_mkt1enc_syntax_error.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/05_mkt1enc_syntax_error.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_mkt1enc_syntax_error.dpatch by Matej Vela +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: t1lib/mkt1enc.sh: Fix unterminated quote. + +@DPATCH@ +diff -urNad vflib3-3.6.13~/t1lib/mkt1enc.sh vflib3-3.6.13/t1lib/mkt1enc.sh +--- vflib3-3.6.13~/t1lib/mkt1enc.sh 2006-10-28 11:51:30.000000000 +0200 ++++ vflib3-3.6.13/t1lib/mkt1enc.sh 2006-10-28 11:52:47.000000000 +0200 +@@ -19,7 +19,7 @@ + esac + + PSENCFILE=$F +- T1ENCFILE=`echo $PSENCFILE | sed 's|.*/\([^/]*\)|\1|' | sed 's|.enc$|.enc|` ++ T1ENCFILE=`echo $PSENCFILE | sed 's|.*/\([^/]*\)|\1|' | sed 's|.enc$|.enc|'` + + echo "$PSENCFILE ==> $T1ENCFILE" + --- vflib3-3.6.14.dfsg.orig/debian/patches/06_strdup_implicit_pointer_conversion.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/06_strdup_implicit_pointer_conversion.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_strdup_implicit_pointer_conversion.dpatch by OHURA Makoto +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix Bug#464465 +## DP: Added -D_GNU_SOURCE to CFLAGS to enable prototype definition +## DP: of strdup(3). + +@DPATCH@ +diff -urNad vflib3-3.6.14.dfsg~/configure.in vflib3-3.6.14.dfsg/configure.in +--- vflib3-3.6.14.dfsg~/configure.in 2008-02-09 00:02:49.000000000 +0900 ++++ vflib3-3.6.14.dfsg/configure.in 2008-02-09 00:10:21.000000000 +0900 +@@ -46,7 +46,7 @@ + AC_PROG_LN_S + + if test "x$CC" = xgcc; then +- XX_CFLAGS="-g -Wall -pedantic -ansi" ++ XX_CFLAGS="-g -Wall -pedantic -ansi -D_GNU_SOURCE" + else + XX_CFLAGS= + fi --- vflib3-3.6.14.dfsg.orig/debian/patches/07_build_with_freetype2.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/07_build_with_freetype2.dpatch @@ -0,0 +1,738 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_build_with_freetype2.dpatch by OHURA Makoto +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad vflib3-3.6.14.dfsg~/configure.in vflib3-3.6.14.dfsg/configure.in +--- vflib3-3.6.14.dfsg~/configure.in 2008-06-07 15:15:49.000000000 +0900 ++++ vflib3-3.6.14.dfsg/configure.in 2008-06-07 15:17:57.000000000 +0900 +@@ -162,6 +162,50 @@ + freetype_includedir=""; freetype_libdir=""; + fi + ++dnl For FreeType 2 ++AC_SUBST(freetype2_includedir) ++AC_SUBST(freetype2_libdir) ++AC_SUBST(freetype2_lib) ++AC_SUBST(freetype2_objs) ++AC_ARG_WITH( ++ freetype2, ++ [ --with-freetype2[=LIB] Link FreeType 2 library LIB [LIB=freetype]], ++ if test "${withval}" = yes; then withval="freetype"; fi; ++ if test "${withval}" = no; then withval=""; fi; ++ if test "${withval}" = ""; then withval="freetype"; fi; ++ if test "${withval}" != ""; then ++ freetype2_lib=-l$withval; freetype2_objs="drv_ttf.lo"; ++ AC_DEFINE(WITH_FREETYPE2) ++ fi) ++AC_ARG_WITH( ++ freetype2-includedir, ++ [ --with-freetype2-includedir=DIR FreeType 2 include files are in DIR], ++ if test "${withval}" = yes; then withval=""; fi; ++ if test "${withval}" = ""; ++ then freetype2_includedir="" ++ else freetype2_includedir=-I${withval}; fi) ++AC_ARG_WITH( ++ freetype2-libdir, ++ [ --with-freetype2-libdir=DIR FreeType 2 library files are in DIR], ++ if test "${withval}" = yes; then withval=""; fi; ++ if test "${withval}" = ""; ++ then freetype2_libdir="" ++ else freetype2_libdir=-L${withval}; fi) ++if test -n "$freetype2_lib" ; then ++ echo "Enabled the FreeType 2 font driver"; ++ OLD_CPPFLAGS=${CPPFLAGS}; OLD_LIBS=${LIBS} ++ CPPFLAGS="${freetype2_includedir} ${CPPFLAGS}" ++ LIBS="${freetype2_libdir} ${freetype2_lib} ${LIBS}"; ++ AC_TRY_CPP([#include ], , ++ AC_MSG_ERROR(Header file is not found: ${freetype2_includedir})) ++ dnl AC_TRY_LINK([#include ], ++ dnl [TT_Engine fte; TT_Init_FreeType(&fte)], , ++ dnl AC_MSG_ERROR(Library file is not found: ${freetype_lib})) ++ CPPFLAGS=${OLD_CPPFLAGS}; LIBS=${OLD_LIBS} ++else echo "Disabled the FreeType 2 font driver"; ++ freetype2_includedir=""; freetype2_libdir=""; ++fi ++ + AC_SUBST(t1lib_includedir) + AC_SUBST(t1lib_libdir) + AC_SUBST(t1lib_lib) +@@ -496,6 +540,11 @@ + else + echo "** Configured to use TrueType." + fi ++if test "x-${freetype2_lib}" = "x-"; then ++ echo "** Configured NOT to use FreeType 2." ++else ++ echo "** Configured to use FreeType 2." ++fi + if test "x-${t1lib_lib}" = "x-"; then + echo "** Configured NOT to use Type 1." + else +diff -urNad vflib3-3.6.14.dfsg~/make-sub.in vflib3-3.6.14.dfsg/make-sub.in +--- vflib3-3.6.14.dfsg~/make-sub.in 2008-02-05 20:26:15.000000000 +0900 ++++ vflib3-3.6.14.dfsg/make-sub.in 2008-06-07 15:17:57.000000000 +0900 +@@ -4,6 +4,7 @@ + VFCFLAGS=${CFLAGS} @XX_CFLAGS@ -DVFLIB_VERSION=\"@vflib_version@\" + LDFLAGS=@LDFLAGS@ + EXT_LIBRARY= @freetype_libdir@ @freetype_lib@ \ ++ @freetype2_libdir@ @freetype2_lib@ \ + @t1lib_libdir@ @t1lib_lib@ \ + @kpathsea_libdir@ @kpathsea_lib@ \ + @gettext_lib@ \ +diff -urNad vflib3-3.6.14.dfsg~/src/Makefile.in vflib3-3.6.14.dfsg/src/Makefile.in +--- vflib3-3.6.14.dfsg~/src/Makefile.in 2008-02-05 20:26:15.000000000 +0900 ++++ vflib3-3.6.14.dfsg/src/Makefile.in 2008-06-07 15:17:57.000000000 +0900 +@@ -35,7 +35,7 @@ + drv_comic.c drv_try.c drv_mojikmap.c + DRV_OBJS = @bdf_objs@ @pcf_objs@ @hbf_objs@ \ + @zeit_objs@ @jg_objs@ @ekan_objs@ \ +- @ttf_objs@ @type1_objs@ \ ++ @ttf_objs@ @freetype2_objs@ @type1_objs@ \ + @texfonts_objs@ \ + @gf_objs@ @pk_objs@ @tfm_objs@ @vf_objs@ @jtex_objs@ \ + @comic_objs@ @try_objs@ @mojikmap_objs@ +@@ -68,7 +68,7 @@ + + drv_ttf.lo: drv_ttf.c ttf.h + $(LIBTOOL) --mode=compile $(CC) $(VFCFLAGS) \ +- @freetype_includedir@ -c drv_ttf.c ++ @freetype_includedir@ @freetype2_includedir@ -c drv_ttf.c + drv_t1.lo: drv_t1.c t1.h + $(LIBTOOL) --mode=compile $(CC) $(VFCFLAGS) \ + @t1lib_includedir@ -c drv_t1.c +diff -urNad vflib3-3.6.14.dfsg~/src/drv_ini.c vflib3-3.6.14.dfsg/src/drv_ini.c +--- vflib3-3.6.14.dfsg~/src/drv_ini.c 2008-02-05 20:26:15.000000000 +0900 ++++ vflib3-3.6.14.dfsg/src/drv_ini.c 2008-06-07 15:17:57.000000000 +0900 +@@ -64,6 +64,9 @@ + #ifdef WITH_TRUETYPE + { VF_Init_Driver_TrueType, "TrueType" }, + #endif ++#ifdef WITH_FREETYPE2 ++ { VF_Init_Driver_TrueType, "TrueType" }, ++#endif + #ifdef WITH_TYPE1 + { VF_Init_Driver_Type1, "Type1" }, + #endif +diff -urNad vflib3-3.6.14.dfsg~/src/drv_ttf.c vflib3-3.6.14.dfsg/src/drv_ttf.c +--- vflib3-3.6.14.dfsg~/src/drv_ttf.c 2008-02-05 20:26:15.000000000 +0900 ++++ vflib3-3.6.14.dfsg/src/drv_ttf.c 2008-06-07 15:17:57.000000000 +0900 +@@ -47,6 +47,7 @@ + */ + + #include "config.h" ++#include "with.h" + #include + #include + #ifdef HAVE_UNISTD_H +@@ -66,7 +67,17 @@ + #include "ccv.h" + + ++#ifdef WITH_FREETYPE2 ++# include ++# include FT_FREETYPE_H ++# include FT_GLYPH_H ++# include FT_TRIGONOMETRY_H ++typedef FT_Face TT_Face; ++typedef FT_UShort TT_UShort; ++typedef FT_Error TT_Error; ++#else + #include "freetype.h" ++#endif + #include "ttf.h" + + #define DIRECTION_HORIZONTAL 0 +@@ -101,10 +112,12 @@ + int release_on_close; + int ttf_opened; + TT_Face tt_face; ++#ifndef WITH_FREETYPE2 + TT_Instance tt_instance; + TT_CharMap tt_charmap; + TT_Glyph tt_glyph; + TT_Face_Properties tt_fprops; ++#endif + TT_UShort tt_upem; + char *font_name; + char *file_path; +@@ -177,11 +190,17 @@ + Private VF_OUTLINE ttf_get_outline1(VF_FONT,long,double,double); + Private char *ttf_get_font_prop(VF_FONT,char*); + ++#ifdef WITH_FREETYPE2 ++Private VF_OUTLINE ++ get_outline_ttf_to_vflib(FONT_TTF, double ps, double mag_x, double mag_y, ++ double dpix, double dpiy, double asp); ++#else + Private VF_OUTLINE + get_outline_ttf_to_vflib(FONT_TTF,TT_Outline*, + TT_Glyph_Metrics*, TT_Instance_Metrics*, + double ps, double mag_x, double mag_y, + double dpix, double dpiy, double asp); ++#endif + Private long fix_jisx0212_row47_empty_sjis(long code_point); + Private int find_encoding_mapping(FONT_TTF); + Private int get_id_from_platform_name(char*); +@@ -195,7 +214,11 @@ + + + ++#ifdef WITH_FREETYPE2 ++static FT_Library library; ++#else + static TT_Engine FreeType_Engine; ++#endif + static int Initialized_FreeType = 0; + + +@@ -259,7 +282,11 @@ + return -1; + + if (Initialized_FreeType == 0){ ++#ifdef WITH_FREETYPE2 ++ error = FT_Init_FreeType(&library); ++#else + error = TT_Init_FreeType(&FreeType_Engine); ++#endif + if (error){ + vf_error = VF_ERR_FREETYPE_INIT; + return -1; +@@ -615,7 +642,24 @@ + + if (font_ttf == NULL) + return NULL; ++#ifdef WITH_FREETYPE2 ++ if (font_ttf->ttf_opened == 0){ ++ if (ttf_debug('f')) ++ printf("VFlib TrueType: FT_New_Face %s\n", font_ttf->font_name); ++ if ((error = FT_New_Face(library, font_path, (fontnum < 0) ? 0 : fontnum, &font_ttf->tt_face))) ++ return NULL; ++ else ++ font_ttf->ttf_opened = 1; + ++ /* needed here? */ ++ font_ttf->tt_upem = font_ttf->tt_face->units_per_EM; ++ ++ if (ttf_debug('n')) ++ printf("VFlib TrueType: the number of embedded faces: %ld\n", (long)font_ttf->tt_face->num_faces); ++ if (error) ++ return NULL; ++ } ++#else + if (font_ttf->ttf_opened == 0){ + if (fontnum < 0){ + if (ttf_debug('f')) +@@ -648,6 +692,7 @@ + if (error) + return NULL; + } ++#endif + + return &font_ttf->tt_face; + } +@@ -661,14 +706,25 @@ + the number of simultaneously opened files */ + if (ttf_debug('f')) + printf("VFlib TrueType: TT_Flush_Face %s\n", font_ttf->font_name); ++#ifdef WITH_FREETYPE2 ++ /* no supported call here... */ ++#else + TT_Flush_Face(font_ttf->tt_face); ++#endif + } else { + /* after a font is closed */ + if (ttf_debug('f')) + printf("VFlib TrueType: TT_Close_Face %s\n", font_ttf->font_name); ++#ifdef WITH_FREETYPE2 ++ FT_Glyph glyph; ++ FT_Get_Glyph(font_ttf->tt_face->glyph, &glyph); ++ FT_Done_Glyph(glyph); ++ FT_Done_Face(font_ttf->tt_face); ++#else + TT_Done_Glyph(font_ttf->tt_glyph); + TT_Done_Instance(font_ttf->tt_instance); + TT_Close_Face(font_ttf->tt_face); ++#endif + vf_free(font_ttf->font_name); + vf_free(font_ttf->file_path); + vf_free(font_ttf); +@@ -772,6 +828,12 @@ + double ps = 0.0, mx, my, asp, aspd; + double dpix = 0.0, dpiy = 0.0; + long cp; ++#ifdef WITH_FREETYPE2 ++ FT_UInt chindex; ++ FT_Int32 load_flag; ++ FT_GlyphSlot slot; ++ FT_Long pointSize; ++#else + int chindex; + int load_flag; + TT_Raster_Map tt_bitmap; +@@ -779,6 +841,7 @@ + TT_Instance_Metrics tt_imetrics; + TT_Outline tt_outline; + TT_Short xoff, yoff; ++#endif + TT_Error error; + + error = 0; +@@ -792,6 +855,10 @@ + my = mag_y * font_ttf->mag * font->mag_y; + asp = v_default_aspect * font_ttf->aspect * (mx / my); + ++#ifdef WITH_FREETYPE2 ++ ps = (my * ((font->point_size < 0) ? font_ttf->point_size : font->point_size)); ++ pointSize = (FT_Long)(ps * 64.0); ++#endif + if ( (mode == MODE_METRIC1) + || (mode == MODE_FONTBBX1) + || (mode == MODE_BITMAP1) +@@ -800,9 +867,11 @@ + dpix = font_ttf->dpi_x; + dpiy = font_ttf->dpi_y; + } ++#ifndef WITH_FREETYPE2 + if ((ps = font->point_size) < 0) + ps = font_ttf->point_size; + ps = ps * my; ++#endif + } else if ( (mode == MODE_METRIC2) + || (mode == MODE_FONTBBX2) + || (mode == MODE_BITMAP2) ){ +@@ -818,6 +887,13 @@ + (FM_OPEN_METHOD)ttf_open_method, + (FM_CLOSE_METHOD)ttf_close_method, "FreeType"); + ++#ifdef WITH_FREETYPE2 ++ if (mode != MODE_OUTLINE){ ++ error = FT_Set_Char_Size(font_ttf->tt_face, 0, (FT_F26Dot6)(ps * 64), (int)dpix, (int)dpiy); ++ } else { ++ error = FT_Set_Char_Size(font_ttf->tt_face, 0, (FT_F26Dot6)12*64, 96*4, 96*4); ++ } ++#else + if (mode != MODE_OUTLINE){ + TT_Set_Instance_Resolutions(font_ttf->tt_instance, dpix, dpiy); + error = TT_Set_Instance_PointSize(font_ttf->tt_instance, ps); +@@ -826,6 +902,7 @@ + 96*4, 96*4); /*XXX THESE ARE AD-HOC VALUES!!*/ + error = TT_Set_Instance_PointSize(font_ttf->tt_instance, 12); + } ++#endif + if (error){ + vf_error = VF_ERR_NO_GLYPH; + return NULL; +@@ -850,7 +927,22 @@ + if (font_ttf->jisx0212_r47e_sjis == TRUE){ + cp = fix_jisx0212_row47_empty_sjis(cp); + } +- ++#ifdef WITH_FREETYPE2 ++ if (mode == MODE_METRIC1) ++ /* should this apply to MODE_METRIC2 as well? */ ++ load_flag = FT_LOAD_NO_BITMAP | FT_LOAD_NO_SCALE; ++ else if (font_ttf->hinting == TRUE) ++ load_flag = FT_LOAD_NO_BITMAP; ++ else ++ load_flag = FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING; ++ error = FT_Load_Char(font_ttf->tt_face, cp, load_flag); ++ if (error) { ++ vf_error = VF_ERR_NO_GLYPH; ++ return NULL; ++ } ++ slot = font_ttf->tt_face->glyph; ++ } ++#else + chindex = TT_Char_Index(font_ttf->tt_charmap, (int)cp); + if (chindex <= 0){ + vf_error = VF_ERR_ILL_CODE_POINT; +@@ -874,9 +966,28 @@ + } + + (void) TT_Get_Instance_Metrics(font_ttf->tt_instance, &tt_imetrics); ++#endif + + if (ttf_debug('m')){ + printf("VFlib TrueType: Metrics\n"); ++#ifdef WITH_FREETYPE2 ++ printf(" in Header upem: %d, xMin: %d, yMin:%d, xMax:%d, yMax:%d\n", ++ font_ttf->tt_face->units_per_EM, ++ font_ttf->tt_face->bbox.xMin, ++ font_ttf->tt_face->bbox.yMin, ++ font_ttf->tt_face->bbox.xMax, ++ font_ttf->tt_face->bbox.yMax); ++ ++ printf(" tt_metrics.bbx xMin:%ld, yMin:%ld, xMax:%ld, yMax:%ld\n", ++ slot->metrics.horiBearingX, ++ slot->metrics.horiBearingY - slot->metrics.height, ++ slot->metrics.width + slot->metrics.horiBearingX, ++ slot->metrics.horiBearingY); ++ ++ printf(" tt_imetrics x_ppem:%d, y_ppem:%d, pointSize:%.4f, upem:%d\n", ++ font_ttf->tt_face->size->metrics.x_ppem, font_ttf->tt_face->size->metrics.y_ppem, ++ (double)(pointSize/64.0), font_ttf->tt_upem); ++#else + printf(" in Header upem: %d, xMin: %d, yMin:%d, xMax:%d, yMax:%d\n", + font_ttf->tt_fprops.header->Units_Per_EM, + font_ttf->tt_fprops.header->xMin, +@@ -889,9 +1000,50 @@ + printf(" tt_imetrics x_ppem:%d, y_ppem:%d, pointSize:%.4f, upem:%d\n", + tt_imetrics.x_ppem, tt_imetrics.y_ppem, + (double)tt_imetrics.pointSize/64.0, font_ttf->tt_upem); ++#endif + } + + val = NULL; ++#ifdef WITH_FREETYPE2 ++ if ((mode == MODE_BITMAP1) || (mode == MODE_BITMAP2)) { ++ FT_Vector vector; ++ FT_Matrix matrix; ++ matrix.xx = (1<<16); ++ matrix.xy = 0; ++ matrix.yx = 0; ++ matrix.yy = (1<<16); ++ aspd = 1.0 - asp; ++ if (aspd < 0) { ++ aspd = 0.0 - aspd; ++ } ++ if (aspd < 1.0e-6) { ++ vector.x = -slot->metrics.horiBearingX; ++ vector.y = slot->metrics.height - slot->metrics.horiBearingY; ++ } else { ++ vector.x = -asp * slot->metrics.horiBearingX;; ++ vector.y = slot->metrics.height - slot->metrics.horiBearingY; ++ matrix.xx *= asp; ++ } ++ FT_Set_Transform(font_ttf->tt_face, &matrix, &vector); ++ error = FT_Render_Glyph(slot, FT_RENDER_MODE_MONO); ++ if (!error) { ++ ALLOC_IF_ERR(bm, struct vf_s_bitmap) { ++ vf_error = VF_ERR_NO_MEMORY; ++ return NULL; ++ } ++ bm->bbx_width = slot->bitmap.width; ++ bm->bbx_height = slot->bitmap.rows; ++ bm->raster = slot->bitmap.pitch; ++ bm->bitmap = malloc(bm->bbx_height * bm->raster); ++ memcpy(bm->bitmap, slot->bitmap.buffer, bm->bbx_height * bm->raster); ++ bm->off_x = toint(slot->metrics.horiBearingX * asp / 64.0); ++ bm->off_y = toint(slot->metrics.horiBearingY / 64.0); ++ bm->mv_x = toint(slot->metrics.horiAdvance * asp / 64.0); ++ bm->mv_y = 0; ++ val = (void*) bm; ++ } ++ ++#else + if ((mode == MODE_BITMAP1) || (mode == MODE_BITMAP2)){ + tt_bitmap.width = (tt_metrics.bbox.xMax-tt_metrics.bbox.xMin)*asp/64 + 1; + tt_bitmap.rows = (tt_metrics.bbox.yMax-tt_metrics.bbox.yMin)/64 + 1; +@@ -934,12 +1086,24 @@ + bm->mv_y = 0; + val = (void*) bm; + ++#endif + } else if (mode == MODE_METRIC1){ ++ if (metric1 != NULL){ ++#ifdef WITH_FREETYPE2 ++ double pt = (double)pointSize / 64.0; ++ double ptx = (double)pointSize * asp / 64.0; ++ int upem = font_ttf->tt_upem; ++ metric1->bbx_width = ((double)slot->metrics.width / upem) * ptx; ++ metric1->bbx_height = ((double)slot->metrics.height / upem) * pt; ++ metric1->off_x = ((double)slot->metrics.horiBearingX / upem) * ptx; ++ metric1->off_y = ((double)slot->metrics.horiBearingY / upem) * pt; ++ metric1->mv_x = ((double)slot->advance.x / upem) * ptx; /*XXX*/ ++ metric1->mv_y = ((double)slot->advance.y / upem) * pt; /*XXX*/ ++#else + double xppem = 64.0 * (double)tt_imetrics.x_ppem; + double yppem = 64.0 * (double)tt_imetrics.y_ppem; + double pt = (double)tt_imetrics.pointSize / 64.0; + double ptx = (double)tt_imetrics.pointSize * asp / 64.0; +- if (metric1 != NULL){ + metric1->bbx_width + = (double)((tt_metrics.bbox.xMax - tt_metrics.bbox.xMin) / xppem)*ptx; + metric1->bbx_height +@@ -948,10 +1112,22 @@ + metric1->off_y = (double)(tt_metrics.bbox.yMax / yppem) * pt; + metric1->mv_x = (double)(tt_metrics.advance / xppem) * ptx; /*XXX*/ + metric1->mv_y = 0.0 * pt; /*XXX*/ ++#endif + } + val = (void*) metric1; + + } else if (mode == MODE_METRIC2){ ++#ifdef WITH_FREETYPE2 ++ if (metric2 != NULL) { ++ metric2->bbx_width = toint((slot->metrics.width * asp) / 64.0); ++ metric2->bbx_height = toint(slot->metrics.height / 64.0); ++ metric2->off_x = toint((slot->metrics.horiBearingX * asp) / 64.0); ++ metric2->off_y = toint(slot->metrics.horiBearingY / 64.0); ++ metric2->mv_x = toint((slot->advance.x * asp) / 64.0); ++ metric2->mv_y = toint(slot->advance.y / 64.0); ++ } ++ val = (void*) metric2; ++#else + if (metric2 != NULL){ + metric2->bbx_width + = toint((double)(tt_metrics.bbox.xMax-tt_metrics.bbox.xMin)*asp /64.0); +@@ -965,6 +1141,11 @@ + val = (void*) metric2; + + } else if (mode == MODE_OUTLINE){ ++#endif ++#ifdef WITH_FREETYPE2 ++ ol = get_outline_ttf_to_vflib(font_ttf, ps, mag_x, mag_y, dpix, dpiy, asp); ++ val = (void*) ol; ++#else + error = TT_Get_Glyph_Outline(font_ttf->tt_glyph, &tt_outline); + if (error) + return NULL; +@@ -975,10 +1156,18 @@ + val = (void*) ol; + + } else if (mode == MODE_FONTBBX1){ ++#endif ++#ifdef WITH_FREETYPE2 ++ long xmax = font_ttf->tt_face->bbox.xMax; ++ long xmin = font_ttf->tt_face->bbox.xMin; ++ long ymax = font_ttf->tt_face->bbox.yMax; ++ long ymin = font_ttf->tt_face->bbox.yMin; ++#else + long xmax = font_ttf->tt_fprops.header->xMax; + long xmin = font_ttf->tt_fprops.header->xMin; + long ymax = font_ttf->tt_fprops.header->yMax; + long ymin = font_ttf->tt_fprops.header->yMin; ++#endif + if (fontbbx1 != NULL){ + fontbbx1->w = (double)(xmax - xmin) * ps * asp / font_ttf->tt_upem; + fontbbx1->h = (double)(ymax - ymin) * ps / font_ttf->tt_upem; +@@ -988,10 +1177,17 @@ + val = (void*) fontbbx1; + + } else if (mode == MODE_FONTBBX2){ ++#ifdef WITH_FREETYPE2 ++ long xmax = font_ttf->tt_face->bbox.xMax; ++ long xmin = font_ttf->tt_face->bbox.xMin; ++ long ymax = font_ttf->tt_face->bbox.yMax; ++ long ymin = font_ttf->tt_face->bbox.yMin; ++#else + long xmax = font_ttf->tt_fprops.header->xMax; + long xmin = font_ttf->tt_fprops.header->xMin; + long ymax = font_ttf->tt_fprops.header->yMax; + long ymin = font_ttf->tt_fprops.header->yMin; ++#endif + if (fontbbx2 != NULL){ + fontbbx2->w = (double)(xmax - xmin) * ps * asp / font_ttf->tt_upem; + fontbbx2->h = (double)(ymax - ymin) * ps / font_ttf->tt_upem; +@@ -1050,6 +1246,11 @@ + * in VFlib 2.23 by Mr Matsuda. + * --- H.Kakugawa + */ ++#ifdef WITH_FREETYPE2 ++Private VF_OUTLINE ++get_outline_ttf_to_vflib(FONT_TTF font_ttf, double ps, double mag_x, double mag_y, ++ double dpix, double dpiy, double asp) ++#else + Private VF_OUTLINE + get_outline_ttf_to_vflib(FONT_TTF font_ttf, + TT_Outline *tt_outline, +@@ -1057,19 +1258,27 @@ + TT_Instance_Metrics *tt_imetrics, + double ps, double mag_x, double mag_y, + double dpix, double dpiy, double asp) ++#endif + { + int vfsize, ct, pt, sp, ep, p1, p2, p3; + int maxw, maxh, bbx; + double x1, y1, x2, y2, x3, y3, f, fupem, mmm; + VF_OUTLINE_ELEM token, *vfdata, *vfp; + +- mmm = 4*4; /*ad-hoc*/ +- ++#ifdef WITH_FREETYPE2 ++ FT_GlyphSlot slot = font_ttf->tt_face->glyph; ++ FT_Outline *tt_outline = &slot->outline; ++ maxw = slot->metrics.width + 1; ++ maxh = slot->metrics.height + 1; ++#else + maxw = (tt_metrics->bbox.xMax - tt_metrics->bbox.xMin + 1); + maxh = (tt_metrics->bbox.yMax - tt_metrics->bbox.yMin + 1); ++#endif + if ((bbx = maxw) < maxh) + bbx = maxh; + ++ mmm = 4*4; /*ad-hoc*/ ++ + #if 0 + printf("*** %d %d %d %d %d %d %d %d\n", + maxw, maxh, bbx, font_ttf->tt_upem, +@@ -1105,7 +1314,11 @@ + /*XXX xCoord => points.x XXX*/ + /*XXX yCoord => points.y XXX*/ + /*XXX flag[] => flags XXX*/ ++#ifdef WITH_FREETYPE2 ++ if (tt_outline->tags[p1] & tt_outline->tags[p2] & TTF_OL_ONCURVE){ ++#else + if (tt_outline->flags[p1] & tt_outline->flags[p2] & TTF_OL_ONCURVE){ ++#endif + /* Line */ + if (token != VF_OL_INSTR_LINE){ + token = VF_OL_INSTR_LINE; +@@ -1113,7 +1326,11 @@ + } + vfsize += 1; + } else { ++#ifdef WITH_FREETYPE2 ++ if (tt_outline->tags[p2] & TTF_OL_ONCURVE) ++#else + if (tt_outline->flags[p2] & TTF_OL_ONCURVE) ++#endif + continue; + /* spline */ + if (token != VF_OL_INSTR_BEZ){ +@@ -1137,6 +1354,18 @@ + vfdata[VF_OL_HEADER_INDEX_DPI_Y] = VF_OL_HEADER_ENCODE(dpiy); + vfdata[VF_OL_HEADER_INDEX_POINT_SIZE] = VF_OL_HEADER_ENCODE(ps); + vfdata[VF_OL_HEADER_INDEX_EM] = ceil(fupem * font_ttf->tt_upem); ++#ifdef WITH_FREETYPE2 ++ vfdata[VF_OL_HEADER_INDEX_MAX_X] = toint(f * slot->metrics.width) + 1; ++ vfdata[VF_OL_HEADER_INDEX_MAX_Y] = toint(f * slot->metrics.height) + 1; ++ /* ... horizintal direction only. B-( */ ++ vfdata[VF_OL_HEADER_INDEX_REF_X] = toint(f * slot->metrics.horiBearingX); ++ vfdata[VF_OL_HEADER_INDEX_REF_Y] = toint(f * slot->metrics.horiBearingY); ++ vfdata[VF_OL_HEADER_INDEX_MV_X] = toint(f * slot->metrics.horiAdvance); ++ vfdata[VF_OL_HEADER_INDEX_MV_Y] = toint(f * 0); ++ ++#define ConvX(x) (long)(VF_OL_COORD_OFFSET + f * ((x)-slot->metrics.horiBearingX)) ++#define ConvY(y) (long)(VF_OL_COORD_OFFSET + f * (slot->metrics.horiBearingY-(y))) ++#else + vfdata[VF_OL_HEADER_INDEX_MAX_X] + = toint(f * (tt_metrics->bbox.xMax - tt_metrics->bbox.xMin)) + 1; + vfdata[VF_OL_HEADER_INDEX_MAX_Y] +@@ -1149,7 +1378,7 @@ + + #define ConvX(x) (long)(VF_OL_COORD_OFFSET + f * ((x)-tt_metrics->bbox.xMin)) + #define ConvY(y) (long)(VF_OL_COORD_OFFSET + f * (tt_metrics->bbox.yMax-(y))) +- ++#endif + vfp = &vfdata[VF_OL_OUTLINE_HEADER_SIZE_TYPE0]; + for (ct = pt = 0; ct < tt_outline->n_contours; ct++){ + token = (VF_OL_INSTR_TOKEN | VF_OL_INSTR_CWCURV); +@@ -1159,7 +1388,11 @@ + p1 = pt; + p2 = (p1 < ep) ? (p1 + 1) : sp; + p3 = (p2 < ep) ? (p2 + 1) : sp; ++#ifdef WITH_FREETYPE2 ++ if (tt_outline->tags[p1] & tt_outline->tags[p2] & TTF_OL_ONCURVE){ ++#else + if (tt_outline->flags[p1] & tt_outline->flags[p2] & TTF_OL_ONCURVE){ ++#endif + /* Line */ + if (token != (VF_OL_INSTR_TOKEN | VF_OL_INSTR_LINE)) { + if (token == (VF_OL_INSTR_TOKEN | VF_OL_INSTR_CWCURV)){ +@@ -1173,7 +1406,11 @@ + y1 = tt_outline->points[p1].y; + *(vfp++) = VF_OL_MAKE_XY(ConvX(x1), ConvY(y1)); + } else { ++#ifdef WITH_FREETYPE2 ++ if (tt_outline->tags[p2] & TTF_OL_ONCURVE) ++#else + if (tt_outline->flags[p2] & TTF_OL_ONCURVE) ++#endif + continue; + /* spline */ + if (token != (VF_OL_INSTR_TOKEN | VF_OL_INSTR_BEZ)){ +@@ -1184,7 +1421,11 @@ + } + token = VF_OL_INSTR_TOKEN | VF_OL_INSTR_BEZ; + } ++#ifdef WITH_FREETYPE2 ++ if (tt_outline->tags[p1] & TTF_OL_ONCURVE){ ++#else + if (tt_outline->flags[p1] & TTF_OL_ONCURVE){ ++#endif + x1 = tt_outline->points[p1].x; + y1 = tt_outline->points[p1].y; + } else { +@@ -1193,7 +1434,11 @@ + } + x2 = tt_outline->points[p2].x; + y2 = tt_outline->points[p2].y; ++#ifdef WITH_FREETYPE2 ++ if (tt_outline->tags[p3] & TTF_OL_ONCURVE){ ++#else + if (tt_outline->flags[p3] & TTF_OL_ONCURVE){ ++#endif + x3 = tt_outline->points[p3].x; + y3 = tt_outline->points[p3].y; + } else { +@@ -1312,7 +1557,11 @@ + + /* Find mapping table number to be used in TrueType font file. */ + map = font_ttf->mapping_id; ++#ifdef WITH_FREETYPE2 ++ ntables = font_ttf->tt_face->num_charmaps; ++#else + ntables = TT_Get_CharMap_Count(font_ttf->tt_face); ++#endif + if (map != TT_MAP_ID_SEARCH){ + if (ntables == 0){ + fprintf(stderr, "VFlib TrueType warning: No mapping tables: %s\n", +@@ -1327,18 +1576,28 @@ + fprintf(stderr, "VFlib TrueType warning: Illegal mapping table ID."); + fprintf(stderr, "Use mapping table #0.\n"); + } ++#ifdef WITH_FREETYPE2 ++ platform_id = font_ttf->tt_face->charmaps[map]->platform_id; ++ encoding_id = font_ttf->tt_face->charmaps[map]->encoding_id; ++#else + error = TT_Get_CharMap_ID(font_ttf->tt_face, map, + &platform_id, &encoding_id); + if (error) + return -1; ++#endif + if (ttf_debug('p')) + printf("VFlib TrueType: Platform,Encoding=(%s,%s)\n", + platform_id2name(platform_id), + encoding_id2name(platform_id, encoding_id)); + } else { + for (map = 0; map < ntables; map++){ ++#ifdef WITH_FREETYPE2 ++ platform_id = font_ttf->tt_face->charmaps[map]->platform_id; ++ encoding_id = font_ttf->tt_face->charmaps[map]->encoding_id; ++#else + error = TT_Get_CharMap_ID(font_ttf->tt_face, map, + &platform_id, &encoding_id); ++#endif + if (ttf_debug('p')) + printf("VFlib TrueType: mapping #%d: Platform: %s, Encoding:%s\n", + map, +@@ -1364,8 +1623,12 @@ + printf("VFlib TrueType: Use mapping table #%d (encoding#%d)\n", + font_ttf->mapping_id, encoding_id); + ++#ifdef WITH_FREETYPE2 ++ error = FT_Set_Charmap(font_ttf->tt_face, font_ttf->tt_face->charmaps[map]); ++#else + error = TT_Get_CharMap(font_ttf->tt_face, font_ttf->mapping_id, + &font_ttf->tt_charmap); ++#endif + if (error) + return -1; + +diff -urNad vflib3-3.6.14.dfsg~/src/with.h.in vflib3-3.6.14.dfsg/src/with.h.in +--- vflib3-3.6.14.dfsg~/src/with.h.in 2008-02-05 20:26:15.000000000 +0900 ++++ vflib3-3.6.14.dfsg/src/with.h.in 2008-06-07 15:17:57.000000000 +0900 +@@ -22,6 +22,9 @@ + /* Define if you compile VFlib with TrueType font driver */ + #undef WITH_TRUETYPE + ++/* Define if you compile VFlib with FreeType 2 font driver */ ++#undef WITH_FREETYPE2 ++ + /* Define if you compile VFlib with Type1 font driver */ + #undef WITH_TYPE1 + --- vflib3-3.6.14.dfsg.orig/debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_fix_ftbfs_on_kfreebsd.dpatch by Cyril Brulebois +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS on GNU/kFreeBSD (Closes: #493125), thanks to Petr Salinger. + +@DPATCH@ +--- vflib3-3.6.14.dfsg/ltconfig ++++ vflib3-3.6.14.dfsg/ltconfig +@@ -1992,7 +1992,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|kfreebsd*-gnu*) + version_type=linux + need_lib_prefix=no + need_version=no --- vflib3-3.6.14.dfsg.orig/debian/patches/09_avoid_segfault_at_vflmklib.c.dpatch +++ vflib3-3.6.14.dfsg/debian/patches/09_avoid_segfault_at_vflmklib.c.dpatch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_avoid_segfault_at_vflmklib.c.dpatch by OHURA Makoto +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Avoid segfault at vflmk utilities. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vflib3-3.6.14.dfsg~/src/vflmklib.c vflib3-3.6.14.dfsg/src/vflmklib.c +--- vflib3-3.6.14.dfsg~/src/vflmklib.c 2008-06-07 18:13:19.000000000 +0900 ++++ vflib3-3.6.14.dfsg/src/vflmklib.c 2010-04-10 21:03:05.000000000 +0900 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + #include + + #ifdef WITH_KPATHSEA --- vflib3-3.6.14.dfsg.orig/debian/rules +++ vflib3-3.6.14.dfsg/debian/rules @@ -0,0 +1,137 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +#export DH_COMPAT=4 + +# Include dpatch stuff. +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +# For debugging: debian policy states that you should build with -g -Wall +CFLAGS += -g -Wall +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# shared library versions, option 1 +#version=2.0.5 +#major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +version=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess . + autoconf2.13 + CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --enable-static \ + --with-freetype2 --with-freetype2-includedir=/usr/include/freetype2 \ + --with-kpathsea --with-kpathsea-includedir=/usr/include/kpathsea \ + --with-texmf-root=/usr/share/texmf \ + --with-gettext + + touch configure-stamp + +build: patch configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr + + # Remove RPATH from the generated library. (lintian) + chrpath -d debian/tmp/usr/lib/libVFlib3.so.5.4.6 + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + #dh_clean -i -k + + dh_installdocs -i + dh_installinfo -i -n + dh_installchangelogs -i CHANGES + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + #dh_clean -a -k + + dh_movefiles -pvflib3 -pvflib3-dev -pvflib3-bin + + # Install Debian specific files + install -m 755 $(CURDIR)/debian/update-vflibcap $(CURDIR)/debian/vflib3/usr/sbin/ + install -m 644 $(CURDIR)/debian/vflibcaps/vflibcap $(CURDIR)/debian/vflib3/etc/vflib3/vflibcaps-common/vflibcap.in + install -m 644 $(CURDIR)/debian/vflibcaps/vflibcap-tex $(CURDIR)/debian/vflib3/etc/vflib3/vflibcaps-common/vflibcap-tex.in + + # Remove unused t1lib script + rm -f debian/vflib3/usr/share/VFlib/3.6.14/t1lib/mkt1enc.sh + + dh_installdocs -a + dh_installman -a + + dh_installchangelogs -a CHANGES + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- vflib3-3.6.14.dfsg.orig/debian/update-vflibcap +++ vflib3-3.6.14.dfsg/debian/update-vflibcap @@ -0,0 +1,59 @@ +#!/bin/sh +# update-vflibcap +# Copyright 2002 Masayuki Hatta +# Public Domain. + +VFLIBDIR=/etc/vflib3 +VFLIBCAPCOMMON=/etc/vflib3/vflibcaps-common/vflibcap.in +VFLIBCAPCOMMON2=/etc/vflib3/vflibcaps-common/vflibcap-tex.in + +if [ "x$1" = "x-v" ]; then + VERBOSE=true +fi + +if [ "$VERBOSE" = "true" ]; then + if [ -f "$VFLIBDIR/vflibcap" ]; then + echo -n "Regenerating $VFLIBDIR/vflibcap... " >&2 + else + echo -n "Generating $VFLIBDIR/vflibcap... " >&2 + fi + if [ -f "$VFLIBDIR/vflibcap-tex" ]; then + echo -n "Regenerating $VFLIBDIR/vflibcap-tex... " >&2 + else + echo -n "Generating $VFLIBDIR/vflibcap-tex... " >&2 + fi +fi + +# +# Generate vflibcap. +# + +(echo "### This file is automatically generated by update-vflibcap"; \ + echo "#"; \ + echo "# Please do not edit this file directly. If you want to change or add"; \ + echo "# anything please invoke"; \ + echo "# update-vflibcap."; \ + echo "#"; \ + echo "###" ) > ${VFLIBDIR}/vflibcap.new + +cat ${VFLIBCAPCOMMON} >> ${VFLIBDIR}/vflibcap.new +mv ${VFLIBDIR}/vflibcap.new ${VFLIBDIR}/vflibcap + +# +# Generate vflibcap-tex. +# + +(echo "### This file is automatically generated by update-vflibcap"; \ + echo "#"; \ + echo "# Please do not edit this file directly. If you want to change or add"; \ + echo "# anything please invoke"; \ + echo "# update-vflibcap."; \ + echo "#"; \ + echo "###" ) > ${VFLIBDIR}/vflibcap-tex.new + +cat ${VFLIBCAPCOMMON2} >> ${VFLIBDIR}/vflibcap-tex.new +mv ${VFLIBDIR}/vflibcap-tex.new ${VFLIBDIR}/vflibcap-tex + +if [ "$VERBOSE" = "true" ]; then + echo "done" +fi --- vflib3-3.6.14.dfsg.orig/debian/vflib3-bin.files +++ vflib3-3.6.14.dfsg/debian/vflib3-bin.files @@ -0,0 +1,3 @@ +usr/bin/ctext2pgm +usr/bin/hyaku* +usr/bin/vfl* --- vflib3-3.6.14.dfsg.orig/debian/vflib3-dev.dirs +++ vflib3-3.6.14.dfsg/debian/vflib3-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include --- vflib3-3.6.14.dfsg.orig/debian/vflib3-dev.files +++ vflib3-3.6.14.dfsg/debian/vflib3-dev.files @@ -0,0 +1,4 @@ +usr/bin/VFlib3-config +usr/include/* +usr/lib/lib*.*a +usr/lib/lib*.so --- vflib3-3.6.14.dfsg.orig/debian/vflib3-doc.doc-base +++ vflib3-3.6.14.dfsg/debian/vflib3-doc.doc-base @@ -0,0 +1,13 @@ +Document: vflib3-doc +Title: VFlib3 Manual +Author: Hirotsugu Kakugawa +Abstract: This manual describes what vflib3 is + and how it can be used +Section: Apps/Programming + +Format: postscript +Files: /usr/share/doc/vflib3-doc/VFlib-36.ps.gz + +Format: HTML +Index: /usr/share/doc/vflib3-doc/VFlib-36_toc.html +Files: /usr/share/doc/vflib3-doc/*.html --- vflib3-3.6.14.dfsg.orig/debian/vflib3-doc.docs +++ vflib3-3.6.14.dfsg/debian/vflib3-doc.docs @@ -0,0 +1,9 @@ +ANNOUNCE-ja.txt +ANNOUNCE.txt +DISTRIB.txt +doc/Paper1/vflib35.ps +doc/Paper2-ja/vflib-ja.ps +doc/VFlib-36.dvi +doc/VFlib-36.ps +doc/VFlib-36.html +doc/VFlib-36_toc.html --- vflib3-3.6.14.dfsg.orig/debian/vflib3-doc.info +++ vflib3-3.6.14.dfsg/debian/vflib3-doc.info @@ -0,0 +1,6 @@ +doc/VFlib-36.info-1 +doc/VFlib-36.info +doc/VFlib-36.info-2 +doc/VFlib-36.info-3 +doc/VFlib-36.info-4 +doc/VFlib-36.info-5 --- vflib3-3.6.14.dfsg.orig/debian/vflib3.dirs +++ vflib3-3.6.14.dfsg/debian/vflib3.dirs @@ -0,0 +1,4 @@ +usr/sbin +etc/vflib3/vflibcaps-common/ + + --- vflib3-3.6.14.dfsg.orig/debian/vflib3.docs +++ vflib3-3.6.14.dfsg/debian/vflib3.docs @@ -0,0 +1 @@ +debian/README.Debian --- vflib3-3.6.14.dfsg.orig/debian/vflib3.files +++ vflib3-3.6.14.dfsg/debian/vflib3.files @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* +usr/share/VFlib --- vflib3-3.6.14.dfsg.orig/debian/vflib3.postinst +++ vflib3-3.6.14.dfsg/debian/vflib3.postinst @@ -0,0 +1,51 @@ +#! /bin/sh +# postinst script for vflib3 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + + rm -rf /usr/share/VFlib/site + ln -sf /etc/vflib3 /usr/share/VFlib/site + update-vflibcap + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- vflib3-3.6.14.dfsg.orig/debian/vflib3.postrm +++ vflib3-3.6.14.dfsg/debian/vflib3.postrm @@ -0,0 +1,44 @@ +#! /bin/sh +# postrm script for vflib3 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + + purge) + + rm -rf /etc/vflib3 + + ;; + + upgrade|remove|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- vflib3-3.6.14.dfsg.orig/debian/vflib3.prerm +++ vflib3-3.6.14.dfsg/debian/vflib3.prerm @@ -0,0 +1,38 @@ +#! /bin/sh +# prerm script for vflib3 +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|upgrade|deconfigure) +# install-info --quiet --remove /usr/info/vflib3.info.gz + rm -rf /usr/share/VFlib/site + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- vflib3-3.6.14.dfsg.orig/debian/vflib3.shlibs +++ vflib3-3.6.14.dfsg/debian/vflib3.shlibs @@ -0,0 +1 @@ +libVFlib3 5 vflib3 --- vflib3-3.6.14.dfsg.orig/debian/vflibcaps/vflibcap +++ vflib3-3.6.14.dfsg/debian/vflibcaps/vflibcap @@ -0,0 +1,433 @@ +;; -*-Lisp-*- + +;; +;; an example of 'vflibcap' +;; by h.kakugawa@computer.org +;; Modified for Debian by mhatta@debian.org +;; + + +;; ----------------------------------------------------------------- +;; VFlib Default +;; ----------------------------------------------------------------- +(define-default VFlib + ;; hint to find font class from font name for fast font open + (extension-hints (".bdf" bdf) (".pcf" pcf) (".hbf" hbf) + (".ttf" truetype) (".ttc" truetype) + (".pfa" type1) (".pfb" type1) + ("pk" TeX) ("gf" gf) ("tfm" tfm) + (".d24" ekanji) (".D24" ekanji)) + ;; implicit font classes + (implicit-font-classes pcf bdf hbf truetype type1 zeit jg gf tfm ekanji) + + ;; uncompression programs + (uncompression-programs (".Z" "zcat") (".gz" "gzip -cd")) + + ;; a list of default values of variables + ;; *Note* "variable-values" must come before variable uses + (variable-values (TeX_DPI "300") + (TeX_USE_KPATHSEA "Yes") + (TeX_KPATHSEA_MODE "cx") + (TeX_KPATHSEA_PROGRAM "vflserver")) + + ;; kpathsea: enabled/disabled + (use-kpathsea $TeX_USE_KPATHSEA) + ;; kpathsea device mode (e.g., "cx") + (kpathsea-mode $TeX_KPATHSEA_MODE) + ;; kpathsea device dpi (e.g., 300) + (kpathsea-dpi $TeX_DPI) + ;; kpathsea program name (e.g., "/usr/local/bin/xdvi") + (kpathsea-program-name $TeX_KPATHSEA_PROGRAM) + + ;; encoding/charset conversion files + (code-conversion-files + "iso8859-1_unicode.ccv" "iso8859-2_unicode.ccv" "iso8859-3_unicode.ccv" + "iso8859-4_unicode.ccv" "iso8859-5_unicode.ccv" "iso8859-6_unicode.ccv" + "iso8859-7_unicode.ccv" "iso8859-8_unicode.ccv" "iso8859-9_unicode.ccv" + "iso8859-10_unicode.ccv" "iso8859-13_unicode.ccv" + "iso8859-14_unicode.ccv" "iso8859-15_unicode.ccv" + "jisx0208_unicode.ccv" "jisx0208sjis_unicode.ccv" + "jisx0201_unicode.ccv" "jisx0212_unicode.ccv" + "ksc5601_unicode.ccv" "ksx1001_unicode.ccv" + "gb12345_unicode.ccv" "gb2312_unicode.ccv" + "big5_unicode.ccv" "cns11643-1_unicode.ccv" "cns11643-2_unicode.ccv" + "iso8859-5_koi8-r.ccv" "koi8-r_iso8859-5.ccv" "koi8-r_unicode.ccv")) + +;; ----------------------------------------------------------------- +;; BDF Font Class Default +;; ----------------------------------------------------------------- +(define-default bdf + ;; font directories + (font-directories "/usr/X11R6/lib/X11/fonts//") + ;; extensions of compressed font files that this font class supports + (compression-extensions ".gz" ".Z") + ;; default values for fonts of this font class + (variable-values (VAR1 ("PROP1" "VAL1")) ; just for debugging... + (VAR2 ("PROP2" "VAL2")) + (VARX ("PROPX" "VFlib-VALX")) ) + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "BDF")) ) + +;; ----------------------------------------------------------------- +;; PCF Font Class Default +;; ----------------------------------------------------------------- +(define-default pcf + ;; font directories + (font-directories "/usr/X11R6/lib/X11/fonts//") + ;; extensions of compressed font files that this font class supports + (compression-extensions ".gz" ".Z") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "PCF")) ) + +;; ----------------------------------------------------------------- +;; HBF Font Class Default +;; ----------------------------------------------------------------- +(define-default hbf + ;; font directories + (font-directories "/usr/local/share/fonts/HBF//") + ;; extensions of compressed font files that this font class supports + (compression-extensions ".gz" ".Z") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "HBF")) ) + +;; ----------------------------------------------------------------- +;; TrueType Font Class Default +;; ----------------------------------------------------------------- +(define-default truetype + ;; font directories + (font-directories "TEXMF" ; - a special name to search by `kpathsea' + "/usr/share/fonts/truetype//") + ;; debugging flags ('*' selects all) + ;;(debug "*") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "TrueType")) ) + +;; ----------------------------------------------------------------- +;; Type1 Font Class Default +;; ----------------------------------------------------------------- +(define-default type1 + ;; font (pfa, pfb) directories + (font-directories "TEXMF" ; - a special name to search by `kpathsea' + "/usr/local/share/fonts/bakoma/pfb/" + "/usr/local/share/fonts/Mojikyo/PFB/") + ;; AFM directories + (afm-directories "TEXMF" ; - a special name to search by `kpathsea' + "/usr/local/share/fonts/Mojikyo/AFM/") + ;; T1Lib logfile output level: "none", "error", "warning", "stat", "debug" + (log-level "none")) + +;; ----------------------------------------------------------------- +;; Syotrai Club Font Class Default +;; ----------------------------------------------------------------- +(define-default zeit + ;; filename extensions ("vf" for "mincho.vf{1,2}") + (filename-extensions ".vf") + ;; font directories + (font-directories "/usr/local/share/fonts/Watanabe//" + "/usr/local/share/fonts/WadaLab//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "ZEIT") + ("CHARSET_REGISTRY" "jisx0208.1983") + ("CHARSET_ENCODING" "0") )) + +;; ----------------------------------------------------------------- +;; JG Font Class Default +;; ----------------------------------------------------------------- +(define-default jg + ;; filename extensions ("fn" for "zkyo0by.fn{0,1,2}") + (filename-extensions ".fn") + ;; font directories + (font-directories "/usr/local/share/fonts/JG-Fonts//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "JG") + ("CHARSET_REGISTRY" "jisx0208.1983") + ("CHARSET_ENCODING" "0"))) + +;; ----------------------------------------------------------------- +;; eKanji Font Class Default +;; See also http://www.zinbun.kyoto-u.ac.jp/~ekanji/ +;; ----------------------------------------------------------------- +(define-default ekanji + ;; font directories + (font-directories "/usr/local/share/fonts/eKanji") + ;; dot size of font files + (font-dot-size 24) + ;; pixel size + (pixel-size 24) + ;; point size, dpi + (point-size 10) (dpi 72.27) + ;; writing direction + (writing-direction horizontal) + ;; debug + ;;(debug "cCf") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "EKANJI"))) + +;; ----------------------------------------------------------------- +;; TeX-related Font Class Default and TeX Font Mapper +;; ----------------------------------------------------------------- +(define-default TeX + ;; TFM file directories + (tfm-directories "TEXMF" + "/usr/local/share/fonts/bakoma/tfm/") + ;; possible extensions of TFM files + (tfm-filename-extensions ".tfm" ".ofm") + ;; font name mapping rules + (font-mapping + ((ascii-jtex-kanji "%f.jtex") + "min*" "goth*" "tmin*" "tgoth*" "fj*" "tfj*" "df*" "tdf*" "rc*" "trc*") + ((pk "%f.%dpk") (gf "%f.%dgf") *) + ((type1 "%f.pfb" point-size-from-tfm (magnification-adjustment 1.0)) *) + ;;((truetype "%f.ttf" point-size-from-tfm (magnification-adjustment 1.0)) *) + ((vf "%f.vf") *) + ((tfm "%f.%dtfm") *)) + ;; accuracy of device resolutions, used with 'resolution-corrections' + (resolution-accuracy 0.02) + ;; font resolution values for each device resolutions. + (resolution-corrections + (240 ;; epson, canonlbp + 240 263 288 312 346 415 498 597) + (300 ;; cx + 300 329 360 432 518 622 746 896 1075 1290 240 270) + (400 ;; sparcptr + 400 438 480 576 691 829 995 1194 1433 1720 320 360) + (600 ;; ljfour + 600 657 720 864 1037 1244 1493 1792 2150 2580 480 540)) + ;; default device resolution + (dpi $TeX_DPI)) + +;; ----------------------------------------------------------------- +;; TeX GF Font Class Default +;; ----------------------------------------------------------------- +(define-default gf + ;; font directories + (font-directories "TEXMF" + "/usr/local/TeX/gf//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "GF")) ) + +;; ----------------------------------------------------------------- +;; TeX PK Font Class Default +;; ----------------------------------------------------------------- +(define-default pk + ;;(debug "m") ;; debug flag + ;; font directories + (font-directories "TEXMF" + "/usr/local/TeX/pk//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "PK")) ) + +;; ----------------------------------------------------------------- +;; TeX TFM Font Class Default +;; ----------------------------------------------------------------- +(define-default tfm + ;; font directories + (font-directories "TEXMF" + "/usr/local/TeX/tfm//") + ;; glyph style: "fill" (all pixels black) or "empty" (all pixels white) + (glyph-style "fill") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "TFM")) ) + +;; ----------------------------------------------------------------- +;; ASCII-jTeX Kanji Font Class Default +;; ----------------------------------------------------------------- +(define-default ascii-jtex-kanji + ;; TFM file directories + (tfm-directories "TEXMF") + ;; possible extensions of TFM files + (tfm-filename-extensions ".tfm") + ;; Suffix for name mapping + ;; (e.g., implicit font "min10.300pk" is mapped to "min10.jtex") + (implicit-font-mapping-suffix ".jtex")) + +;; ----------------------------------------------------------------- +;; Japanese Comic Font Class Default +;; ----------------------------------------------------------------- +(define-default japanese-comic + ;; debugging flags ('*' selects all) + ;;(debug "f") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "JAPANESE-COMIC") + ("CHARSET_REGISTRY" "jisx0208.1983") + ("CHARSET_ENCODING" "0"))) + + +;; ----------------------------------------------------------------- +;; Mojikyo Font Mapper Class Default +;; ----------------------------------------------------------------- +(define-default mojikyo-mapper + ;; debugging flags ('*' selects all) + ;;(debug "f") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "MOJIKYO-MAPPER"))) + + +;; ----------------------------------------------------------------- +;; sample font definitions for Japanese TeX + +(define-font jtex-min debian-vfont-Mincho) +(define-font jtex-goth debian-vfont-Gothic) +(define-font jtex-tmin debian-vfont-Mincho) +(define-font jtex-tgoth debian-vfont-Gothic) + +;; Definitions for "min10" fonts. These fonts are used by +;; 'name mapping' feature of ascii-jtex-kanji driver. +;; (e.g., "min10.400pk" is mapped to "min10.jtex") +(define-macro min-common + (font-class ascii-jtex-kanji) (kanji-font jtex-min) + (kanji-font-magnification 0.85) (metric-adjustment-file "mincho.adj")) +(define-macro goth-common + (font-class ascii-jtex-kanji) (kanji-font jtex-goth) + (kanji-font-magnification 0.85) (metric-adjustment-file "asiya24.adj")) +(define-macro tmin-common + (font-class ascii-jtex-kanji) (kanji-font jtex-tmin) + (kanji-font-magnification 0.85) (metric-adjustment-file "tmincho.adj")) +(define-macro tgoth-common + (font-class ascii-jtex-kanji) (kanji-font jtex-tgoth) + (kanji-font-magnification 0.85) (metric-adjustment-file "tasiya24.adj")) +(define-font min5.jtex (kanji-font-point-size 5) min-common) +(define-font min6.jtex (kanji-font-point-size 6) min-common) +(define-font min7.jtex (kanji-font-point-size 7) min-common) +(define-font min8.jtex (kanji-font-point-size 8) min-common) +(define-font min9.jtex (kanji-font-point-size 9) min-common) +(define-font min10.jtex (kanji-font-point-size 10) min-common) +(define-font goth5.jtex (kanji-font-point-size 5) goth-common) +(define-font goth6.jtex (kanji-font-point-size 6) goth-common) +(define-font goth7.jtex (kanji-font-point-size 7) goth-common) +(define-font goth8.jtex (kanji-font-point-size 8) goth-common) +(define-font goth9.jtex (kanji-font-point-size 9) goth-common) +(define-font goth10.jtex (kanji-font-point-size 10) goth-common) +(define-font tmin5.jtex (kanji-font-point-size 5) tmin-common) +(define-font tmin6.jtex (kanji-font-point-size 6) tmin-common) +(define-font tmin7.jtex (kanji-font-point-size 7) tmin-common) +(define-font tmin8.jtex (kanji-font-point-size 8) tmin-common) +(define-font tmin9.jtex (kanji-font-point-size 9) tmin-common) +(define-font tmin10.jtex (kanji-font-point-size 10) tmin-common) +(define-font tgoth5.jtex (kanji-font-point-size 5) tgoth-common) +(define-font tgoth6.jtex (kanji-font-point-size 6) tgoth-common) +(define-font tgoth7.jtex (kanji-font-point-size 7) tgoth-common) +(define-font tgoth8.jtex (kanji-font-point-size 8) tgoth-common) +(define-font tgoth9.jtex (kanji-font-point-size 9) tgoth-common) +(define-font tgoth10.jtex (kanji-font-point-size 10) tgoth-common) + + +(define-font kanji10.jtex + (tfm-file "min10.tfm") + (kanji-font-point-size 10) + min-common) + + +;; ----------------------------------------------------------------- +;; for debugging .... + + +(define-macro size-definition + (point-size 10) + (dpi 300)) + +(define-font f5ajchm3-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file "/usr/local/share/fonts/FontCity2/f5ajchm3.ttf")) + +(define-font dfhsgw3-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file + "/usr/local/share/fonts/DynaFont-Premium30/win31/sbtt/dfhsgw3.ttf")) + +(define-font dfhsmw3-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file + "/usr/local/share/fonts/DynaFont-Premium30/win31/sbtt/dfhsmw3.ttf")) + +(define-font dfhsm3-comic + (font-class japanese-comic) + (kanji-font "dfhsgw3-ttf") + (kana-font "dfhsmw3-ttf")) + +(define-font dfhsmw5-ttc + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file + "/usr/local/share/fonts/DynaFont-Premium30/win95/futt/dfhsmw5.ttc")) + +(define-font mincho-zeit + (font-class zeit) + size-definition + (font-file "mincho")) + +(define-font zkyo0by-jg + (font-class jg) + size-definition + (font-file "zkyo0by")) + +(define-font activa-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "iso8859-1") + (encoding "unicode") + size-definition + (font-file "/usr/local/share/fonts/FontGarden/ttf/a/activa__.ttf")) + +(define-font cmr10-pk + (font-class pk) + size-definition + (font-file "cmr10.300pk")) + +(define-font cmr10-tfm + (font-class tfm) + size-definition + (font-file "cmr10.tfm")) + +(define-font timR24-pcf + (font-class pcf) + size-definition + (font-file "timR24.pcf")) + + +(define-default try + (debug "f")) +(define-font try-1 + (font-class try) + (font-list "foobar1.pcf" "foobar2.pcf" "timR24-pcf" "foobar3.pcf")) + + + +;; Mojikyo Mapper + +(define-font mojikyo-ttf + (font-class mojikyo-mapper) + (division-scheme TrueType) + (truetype-subfont-encoding UNICODE) + (subfont-name-format "Mojik%d.ttf")) + +(define-font mojikyo-type1 + (font-class mojikyo-mapper) + (division-scheme Type1) + (subfont-name-format "mo%dm%02d.pfb")) + + +;; Direct access to eKanji font files. +(define-font ekan0010 (font-class ekanji) (font-file "ekan0010.d24")) +(define-font ekan0020 (font-class ekanji) (font-file "ekan0020.d24")) +(define-font ekan0030 (font-class ekanji) (font-file "ekan0030.d24")) +(define-font jisx9052 (font-class ekanji) (font-file "jisx9052.d24")) + + +;; ----------------------------------------------------------------- +;; EOF --- vflib3-3.6.14.dfsg.orig/debian/vflibcaps/vflibcap-tex +++ vflib3-3.6.14.dfsg/debian/vflibcaps/vflibcap-tex @@ -0,0 +1,433 @@ +;; -*-Lisp-*- + +;; +;; an example of 'vflibcap-tex' +;; by h.kakugawa@computer.org +;; Modified for Debian by mhatta@debian.org +;; + + +;; ----------------------------------------------------------------- +;; VFlib Default +;; ----------------------------------------------------------------- +(define-default VFlib + ;; hint to find font class from font name for fast font open + (extension-hints (".bdf" bdf) (".pcf" pcf) (".hbf" hbf) + (".ttf" truetype) (".ttc" truetype) + (".pfa" type1) (".pfb" type1) + ("pk" TeX) ("gf" gf) ("tfm" tfm) + (".d24" ekanji) (".D24" ekanji)) + ;; implicit font classes + (implicit-font-classes pcf bdf hbf truetype type1 zeit jg gf tfm ekanji) + + ;; uncompression programs + (uncompression-programs (".Z" "zcat") (".gz" "gzip -cd")) + + ;; a list of default values of variables + ;; *Note* "variable-values" must come before variable uses + (variable-values (TeX_DPI "300") + (TeX_USE_KPATHSEA "Yes") + (TeX_KPATHSEA_MODE "cx") + (TeX_KPATHSEA_PROGRAM "vflserver")) + + ;; kpathsea: enabled/disabled + (use-kpathsea $TeX_USE_KPATHSEA) + ;; kpathsea device mode (e.g., "cx") + (kpathsea-mode $TeX_KPATHSEA_MODE) + ;; kpathsea device dpi (e.g., 300) + (kpathsea-dpi $TeX_DPI) + ;; kpathsea program name (e.g., "/usr/local/bin/xdvi") + (kpathsea-program-name $TeX_KPATHSEA_PROGRAM) + + ;; encoding/charset conversion files + (code-conversion-files + "iso8859-1_unicode.ccv" "iso8859-2_unicode.ccv" "iso8859-3_unicode.ccv" + "iso8859-4_unicode.ccv" "iso8859-5_unicode.ccv" "iso8859-6_unicode.ccv" + "iso8859-7_unicode.ccv" "iso8859-8_unicode.ccv" "iso8859-9_unicode.ccv" + "iso8859-10_unicode.ccv" "iso8859-13_unicode.ccv" + "iso8859-14_unicode.ccv" "iso8859-15_unicode.ccv" + "jisx0208_unicode.ccv" "jisx0208sjis_unicode.ccv" + "jisx0201_unicode.ccv" "jisx0212_unicode.ccv" + "ksc5601_unicode.ccv" "ksx1001_unicode.ccv" + "gb12345_unicode.ccv" "gb2312_unicode.ccv" + "big5_unicode.ccv" "cns11643-1_unicode.ccv" "cns11643-2_unicode.ccv" + "iso8859-5_koi8-r.ccv" "koi8-r_iso8859-5.ccv" "koi8-r_unicode.ccv")) + +;; ----------------------------------------------------------------- +;; BDF Font Class Default +;; ----------------------------------------------------------------- +(define-default bdf + ;; font directories + (font-directories "/usr/X11R6/lib/X11/fonts//") + ;; extensions of compressed font files that this font class supports + (compression-extensions ".gz" ".Z") + ;; default values for fonts of this font class + (variable-values (VAR1 ("PROP1" "VAL1")) ; just for debugging... + (VAR2 ("PROP2" "VAL2")) + (VARX ("PROPX" "VFlib-VALX")) ) + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "BDF")) ) + +;; ----------------------------------------------------------------- +;; PCF Font Class Default +;; ----------------------------------------------------------------- +(define-default pcf + ;; font directories + (font-directories "/usr/X11R6/lib/X11/fonts//") + ;; extensions of compressed font files that this font class supports + (compression-extensions ".gz" ".Z") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "PCF")) ) + +;; ----------------------------------------------------------------- +;; HBF Font Class Default +;; ----------------------------------------------------------------- +(define-default hbf + ;; font directories + (font-directories "/usr/local/share/fonts/HBF//") + ;; extensions of compressed font files that this font class supports + (compression-extensions ".gz" ".Z") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "HBF")) ) + +;; ----------------------------------------------------------------- +;; TrueType Font Class Default +;; ----------------------------------------------------------------- +(define-default truetype + ;; font directories + (font-directories "TEXMF" ; - a special name to search by `kpathsea' + "/usr/share/fonts/truetype//") + ;; debugging flags ('*' selects all) + ;;(debug "*") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "TrueType")) ) + +;; ----------------------------------------------------------------- +;; Type1 Font Class Default +;; ----------------------------------------------------------------- +(define-default type1 + ;; font (pfa, pfb) directories + (font-directories "TEXMF" ; - a special name to search by `kpathsea' + "/usr/local/share/fonts/bakoma/pfb/" + "/usr/local/share/fonts/Mojikyo/PFB/") + ;; AFM directories + (afm-directories "TEXMF" ; - a special name to search by `kpathsea' + "/usr/local/share/fonts/Mojikyo/AFM/") + ;; T1Lib logfile output level: "none", "error", "warning", "stat", "debug" + (log-level "none")) + +;; ----------------------------------------------------------------- +;; Syotrai Club Font Class Default +;; ----------------------------------------------------------------- +(define-default zeit + ;; filename extensions ("vf" for "mincho.vf{1,2}") + (filename-extensions ".vf") + ;; font directories + (font-directories "/usr/local/share/fonts/Watanabe//" + "/usr/local/share/fonts/WadaLab//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "ZEIT") + ("CHARSET_REGISTRY" "jisx0208.1983") + ("CHARSET_ENCODING" "0") )) + +;; ----------------------------------------------------------------- +;; JG Font Class Default +;; ----------------------------------------------------------------- +(define-default jg + ;; filename extensions ("fn" for "zkyo0by.fn{0,1,2}") + (filename-extensions ".fn") + ;; font directories + (font-directories "/usr/local/share/fonts/JG-Fonts//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "JG") + ("CHARSET_REGISTRY" "jisx0208.1983") + ("CHARSET_ENCODING" "0"))) + +;; ----------------------------------------------------------------- +;; eKanji Font Class Default +;; See also http://www.zinbun.kyoto-u.ac.jp/~ekanji/ +;; ----------------------------------------------------------------- +(define-default ekanji + ;; font directories + (font-directories "/usr/local/share/fonts/eKanji") + ;; dot size of font files + (font-dot-size 24) + ;; pixel size + (pixel-size 24) + ;; point size, dpi + (point-size 10) (dpi 72.27) + ;; writing direction + (writing-direction horizontal) + ;; debug + ;;(debug "cCf") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "EKANJI"))) + +;; ----------------------------------------------------------------- +;; TeX-related Font Class Default and TeX Font Mapper +;; ----------------------------------------------------------------- +(define-default TeX + ;; TFM file directories + (tfm-directories "TEXMF" + "/usr/local/share/fonts/bakoma/tfm/") + ;; possible extensions of TFM files + (tfm-filename-extensions ".tfm" ".ofm") + ;; font name mapping rules + (font-mapping + ((ascii-jtex-kanji "%f.jtex") + "min*" "goth*" "tmin*" "tgoth*" "fj*" "tfj*" "df*" "tdf*" "rc*" "trc*") + ((pk "%f.%dpk") (gf "%f.%dgf") *) + ((type1 "%f.pfb" point-size-from-tfm (magnification-adjustment 1.0)) *) + ;;((truetype "%f.ttf" point-size-from-tfm (magnification-adjustment 1.0)) *) + ((vf "%f.vf") *) + ((tfm "%f.%dtfm") *)) + ;; accuracy of device resolutions, used with 'resolution-corrections' + (resolution-accuracy 0.02) + ;; font resolution values for each device resolutions. + (resolution-corrections + (240 ;; epson, canonlbp + 240 263 288 312 346 415 498 597) + (300 ;; cx + 300 329 360 432 518 622 746 896 1075 1290 240 270) + (400 ;; sparcptr + 400 438 480 576 691 829 995 1194 1433 1720 320 360) + (600 ;; ljfour + 600 657 720 864 1037 1244 1493 1792 2150 2580 480 540)) + ;; default device resolution + (dpi $TeX_DPI)) + +;; ----------------------------------------------------------------- +;; TeX GF Font Class Default +;; ----------------------------------------------------------------- +(define-default gf + ;; font directories + (font-directories "TEXMF" + "/usr/local/TeX/gf//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "GF")) ) + +;; ----------------------------------------------------------------- +;; TeX PK Font Class Default +;; ----------------------------------------------------------------- +(define-default pk + ;;(debug "m") ;; debug flag + ;; font directories + (font-directories "TEXMF" + "/usr/local/TeX/pk//") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "PK")) ) + +;; ----------------------------------------------------------------- +;; TeX TFM Font Class Default +;; ----------------------------------------------------------------- +(define-default tfm + ;; font directories + (font-directories "TEXMF" + "/usr/local/TeX/tfm//") + ;; glyph style: "fill" (all pixels black) or "empty" (all pixels white) + (glyph-style "fill") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "TFM")) ) + +;; ----------------------------------------------------------------- +;; ASCII-jTeX Kanji Font Class Default +;; ----------------------------------------------------------------- +(define-default ascii-jtex-kanji + ;; TFM file directories + (tfm-directories "TEXMF") + ;; possible extensions of TFM files + (tfm-filename-extensions ".tfm") + ;; Suffix for name mapping + ;; (e.g., implicit font "min10.300pk" is mapped to "min10.jtex") + (implicit-font-mapping-suffix ".jtex")) + +;; ----------------------------------------------------------------- +;; Japanese Comic Font Class Default +;; ----------------------------------------------------------------- +(define-default japanese-comic + ;; debugging flags ('*' selects all) + ;;(debug "f") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "JAPANESE-COMIC") + ("CHARSET_REGISTRY" "jisx0208.1983") + ("CHARSET_ENCODING" "0"))) + + +;; ----------------------------------------------------------------- +;; Mojikyo Font Mapper Class Default +;; ----------------------------------------------------------------- +(define-default mojikyo-mapper + ;; debugging flags ('*' selects all) + ;;(debug "f") + ;; properties for all fonts of this font class + (properties ("FONT_CLASS" "MOJIKYO-MAPPER"))) + + +;; ----------------------------------------------------------------- +;; sample font definitions for Japanese TeX + +(define-font jtex-min debian-vfont-Mincho) +(define-font jtex-goth debian-vfont-Gothic) +(define-font jtex-tmin debian-vfont-Mincho) +(define-font jtex-tgoth debian-vfont-Gothic) + +;; Definitions for "min10" fonts. These fonts are used by +;; 'name mapping' feature of ascii-jtex-kanji driver. +;; (e.g., "min10.400pk" is mapped to "min10.jtex") +(define-macro min-common + (font-class ascii-jtex-kanji) (kanji-font jtex-min) + (kanji-font-magnification 0.85) (metric-adjustment-file "mincho.adj")) +(define-macro goth-common + (font-class ascii-jtex-kanji) (kanji-font jtex-goth) + (kanji-font-magnification 0.85) (metric-adjustment-file "asiya24.adj")) +(define-macro tmin-common + (font-class ascii-jtex-kanji) (kanji-font jtex-tmin) + (kanji-font-magnification 0.85) (metric-adjustment-file "tmincho.adj")) +(define-macro tgoth-common + (font-class ascii-jtex-kanji) (kanji-font jtex-tgoth) + (kanji-font-magnification 0.85) (metric-adjustment-file "tasiya24.adj")) +(define-font min5.jtex (kanji-font-point-size 5) min-common) +(define-font min6.jtex (kanji-font-point-size 6) min-common) +(define-font min7.jtex (kanji-font-point-size 7) min-common) +(define-font min8.jtex (kanji-font-point-size 8) min-common) +(define-font min9.jtex (kanji-font-point-size 9) min-common) +(define-font min10.jtex (kanji-font-point-size 10) min-common) +(define-font goth5.jtex (kanji-font-point-size 5) goth-common) +(define-font goth6.jtex (kanji-font-point-size 6) goth-common) +(define-font goth7.jtex (kanji-font-point-size 7) goth-common) +(define-font goth8.jtex (kanji-font-point-size 8) goth-common) +(define-font goth9.jtex (kanji-font-point-size 9) goth-common) +(define-font goth10.jtex (kanji-font-point-size 10) goth-common) +(define-font tmin5.jtex (kanji-font-point-size 5) tmin-common) +(define-font tmin6.jtex (kanji-font-point-size 6) tmin-common) +(define-font tmin7.jtex (kanji-font-point-size 7) tmin-common) +(define-font tmin8.jtex (kanji-font-point-size 8) tmin-common) +(define-font tmin9.jtex (kanji-font-point-size 9) tmin-common) +(define-font tmin10.jtex (kanji-font-point-size 10) tmin-common) +(define-font tgoth5.jtex (kanji-font-point-size 5) tgoth-common) +(define-font tgoth6.jtex (kanji-font-point-size 6) tgoth-common) +(define-font tgoth7.jtex (kanji-font-point-size 7) tgoth-common) +(define-font tgoth8.jtex (kanji-font-point-size 8) tgoth-common) +(define-font tgoth9.jtex (kanji-font-point-size 9) tgoth-common) +(define-font tgoth10.jtex (kanji-font-point-size 10) tgoth-common) + + +(define-font kanji10.jtex + (tfm-file "min10.tfm") + (kanji-font-point-size 10) + min-common) + + +;; ----------------------------------------------------------------- +;; for debugging .... + + +(define-macro size-definition + (point-size 10) + (dpi 300)) + +(define-font f5ajchm3-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file "/usr/local/share/fonts/FontCity2/f5ajchm3.ttf")) + +(define-font dfhsgw3-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file + "/usr/local/share/fonts/DynaFont-Premium30/win31/sbtt/dfhsgw3.ttf")) + +(define-font dfhsmw3-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file + "/usr/local/share/fonts/DynaFont-Premium30/win31/sbtt/dfhsmw3.ttf")) + +(define-font dfhsm3-comic + (font-class japanese-comic) + (kanji-font "dfhsgw3-ttf") + (kana-font "dfhsmw3-ttf")) + +(define-font dfhsmw5-ttc + (font-class truetype) + (platform-id "microsoft") + (character-set "JISX0208") + (encoding "ISO2022") + size-definition + (font-file + "/usr/local/share/fonts/DynaFont-Premium30/win95/futt/dfhsmw5.ttc")) + +(define-font mincho-zeit + (font-class zeit) + size-definition + (font-file "mincho")) + +(define-font zkyo0by-jg + (font-class jg) + size-definition + (font-file "zkyo0by")) + +(define-font activa-ttf + (font-class truetype) + (platform-id "microsoft") + (character-set "iso8859-1") + (encoding "unicode") + size-definition + (font-file "/usr/local/share/fonts/FontGarden/ttf/a/activa__.ttf")) + +(define-font cmr10-pk + (font-class pk) + size-definition + (font-file "cmr10.300pk")) + +(define-font cmr10-tfm + (font-class tfm) + size-definition + (font-file "cmr10.tfm")) + +(define-font timR24-pcf + (font-class pcf) + size-definition + (font-file "timR24.pcf")) + + +(define-default try + (debug "f")) +(define-font try-1 + (font-class try) + (font-list "foobar1.pcf" "foobar2.pcf" "timR24-pcf" "foobar3.pcf")) + + + +;; Mojikyo Mapper + +(define-font mojikyo-ttf + (font-class mojikyo-mapper) + (division-scheme TrueType) + (truetype-subfont-encoding UNICODE) + (subfont-name-format "Mojik%d.ttf")) + +(define-font mojikyo-type1 + (font-class mojikyo-mapper) + (division-scheme Type1) + (subfont-name-format "mo%dm%02d.pfb")) + + +;; Direct access to eKanji font files. +(define-font ekan0010 (font-class ekanji) (font-file "ekan0010.d24")) +(define-font ekan0020 (font-class ekanji) (font-file "ekan0020.d24")) +(define-font ekan0030 (font-class ekanji) (font-file "ekan0030.d24")) +(define-font jisx9052 (font-class ekanji) (font-file "jisx9052.d24")) + + +;; ----------------------------------------------------------------- +;; EOF --- vflib3-3.6.14.dfsg.orig/debian/watch +++ vflib3-3.6.14.dfsg/debian/watch @@ -0,0 +1,5 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +TypeHack.aial.hiroshima-u.ac.jp /pub/TypeHack/ VFlib3-(.*)\.tar\.gz debian uupdate