From: John Darrington Date: Fri, 21 May 2010 10:22:51 +0000 (+0200) Subject: Merge commit 'origin/covariance' X-Git-Tag: v0.7.5~7 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;hp=56c42d61d46aea9d13dcf55e9e2252805282570b;p=pspp-builds.git Merge commit 'origin/covariance' Conflicts: src/data/dictionary.c src/language/stats/correlations.c src/language/stats/regression.q src/math/automake.mk --- diff --git a/.gitignore b/.gitignore index ad89bf36..25b989e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ -ABOUT-NLS ChangeLog -Makefile -Makefile.in +/Makefile +/Makefile.in +/gl/Makefile +/gl/Makefile.in aclocal.m4 autom4te.cache compile @@ -39,3 +40,8 @@ gitlog-to-changelog *.deps *.la *.libs +/arg-nonnull.h +/c++defs.h +/package.m4 +/unused-parameter.h +/warn-on-use.h diff --git a/ABOUT-NLS b/ABOUT-NLS new file mode 100644 index 00000000..51510b52 --- /dev/null +++ b/ABOUT-NLS @@ -0,0 +1,1303 @@ +1 Notes on the Free Translation Project +*************************************** + +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all +together, so that free software will gradually become able to speak many +languages. A few packages already provide translations for their +messages. + + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, +itself available at your nearest GNU archive site. But you do _not_ +need to install GNU `gettext' prior to configuring, installing or using +this package with messages translated. + + Installers will find here some useful hints. These notes also +explain how users should proceed for getting the programs to use the +available translations. They tell how people wanting to contribute and +work on translations can contact the appropriate team. + + When reporting bugs in the `intl/' directory or bugs which may be +related to internationalization, you should tell about the version of +`gettext' which is used. The information can be found in the +`intl/VERSION' file, in internationalized packages. + +1.1 Quick configuration advice +============================== + +If you want to exploit the full power of internationalization, you +should configure it using + + ./configure --with-included-gettext + +to force usage of internationalizing routines provided within this +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. + +1.2 INSTALL Matters +=================== + +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. + + By default, this package will be installed to allow translation of +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the included GNU +`gettext' library will be used. This library is wholly contained +within this package, usually in the `intl/' subdirectory, so prior +installation of the GNU `gettext' package is _not_ required. +Installers may use special options at configuration time for changing +the default behaviour. The commands: + + ./configure --with-included-gettext + ./configure --disable-nls + +will, respectively, bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. + + When you already have GNU `gettext' installed on your system and run +configure without an option for your new package, `configure' will +probably detect the previously built and installed `libintl.a' file and +will decide to use this. This might not be desirable. You should use +the more recent version of the GNU `gettext' library. I.e. if the file +`intl/VERSION' shows that the library which comes with this package is +more recent, you should use + + ./configure --with-included-gettext + +to prevent auto-detection. + + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. + + Internationalized packages usually have many `po/LL.po' files, where +LL gives an ISO 639 two-letter code identifying the language. Unless +translations have been forbidden at `configure' time by using the +`--disable-nls' switch, all available translations are installed +together with the package. However, the environment variable `LINGUAS' +may be set, prior to configuration, to limit the installed set. +`LINGUAS' should then contain a space separated list of two-letter +codes, stating which languages are allowed. + +1.3 Using This Package +====================== + +As a user, if your language has been installed for this package, you +only have to set the `LANG' environment variable to the appropriate +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your language by running the +command `locale -a | grep '^LL''. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. + +1.4 Translating Teams +===================== + +For the Free Translation Project to be a success, we need interested +people who like their own language and write it well, and who are also +able to synergize with other translators speaking the same language. +Each translation team has its own mailing list. The up-to-date list of +teams can be found at the Free Translation Project's homepage, +`http://translationproject.org/', in the "Teams" area. + + If you'd like to volunteer to _work_ at translating messages, you +should become a member of the translating team for your own language. +The subscribing address is _not_ the same as the list itself, it has +`-request' appended. For example, speakers of Swedish can send a +message to `sv-request@li.org', having this message body: + + subscribe + + Keep in mind that team members are expected to participate +_actively_ in translations, or at solving translational difficulties, +rather than merely lurking around. If your team does not exist yet and +you want to start one, or if you are unsure about what to do or how to +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. + + The English team is special. It works at improving and uniformizing +the terminology in use. Proven linguistic skills are praised more than +programming skills, here. + +1.5 Available Packages +====================== + +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of March +2010. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files af am ar ast az be be@latin bg bn_IN bs ca crh + +------------------------------------------------+ + a2ps | [] [] | + aegis | | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | + bfd | | + bibshelf | [] | + binutils | | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | + doodle | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | + gas | | + gawk | [] [] | + gcal | [] | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] | + gliv | [] | + glunarclock | [] [] | + gnubiff | | + gnucash | [] | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] | + iso_639_3 | [] | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | + libextractor | | + libgnutls | | + libgpewidget | | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | + mailutils | | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | + pwdutils | | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | | + solfege-manual | | + soundtracker | | + sp | | + sysstat | | + tar | [] | + texinfo | | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +------------------------------------------------+ + af am ar ast az be be@latin bg bn_IN bs ca crh + 6 0 2 19 1 10 3 28 2 1 38 5 + + cs da de el en en_GB en_ZA eo es et eu fa fi + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] [] [] | + cflow | [] [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | [] | + cppi | | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] [] | + gliv | [] [] [] [] | + glunarclock | [] [] [] | + gnubiff | () | + gnucash | [] () () () () () | + gnuedu | [] [] | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] [] [] | + gpe-beam | [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] [] | + gpe-sketchbook | [] [] [] [] [] | + gpe-su | [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] () [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] | + gsasl | [] [] | + gss | [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] | + gtick | [] () [] [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] [] | + hylafax | [] [] | + idutils | [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] [] | + iso_3166 | [] [] [] () [] [] [] () [] | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] [] | + iso_639 | [] [] [] () [] [] [] | + iso_639_3 | | + jwhois | [] [] | + kbd | [] [] [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] | + klavaro | [] [] [] [] | + latrine | [] () [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] [] | + linkdr | [] [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] [] | + mkisofs | [] | + nano | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] [] | + psmisc | [] [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] [] | + rush | | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] | + wyslij-po | [] | + xchat | [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + cs da de el en en_GB en_ZA eo es et eu fa fi + 64 103 113 18 1 8 0 28 89 18 19 0 100 + + fr ga gl gu he hi hr hu hy id is it ja ka kn + +------------------------------------------------+ + a2ps | [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] | + bash | [] | + bfd | [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | | + buzztard | [] | + cflow | [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] | + freedink | [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] | + gliv | () | + glunarclock | [] [] [] | + gnubiff | () [] () | + gnucash | () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] | + gpe-beam | [] [] [] | + gpe-bluetooth | [] [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] | + gpe-su | [] [] [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | | + grub | [] | + gsasl | [] [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | () [] [] | + iso_3166 | () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] | + iso_4217 | () [] [] [] [] | + iso_639 | () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] | + keytouch-editor | [] [] [] [] | + keytouch-keyboa... | [] [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] () | + libc | [] [] [] [] | + libexif | | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] | + linkdr | [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + nano | [] [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] | + psmisc | [] [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] | + rush | | + screem | [] [] | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] | + xchat | [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + +------------------------------------------------+ + fr ga gl gu he hi hr hu hy id is it ja ka kn + 116 53 20 4 8 2 5 50 2 120 5 81 64 0 4 + + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 12 48 4 1 2 4 24 10 19 3 1 + + nl nn pa pl ps pt pt_BR ro ru rw sk sl sq sr sv + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] [] | + cpio | [] [] [] [] | + cppi | | + cpplib | [] [] | + cryptsetup | [] [] | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] [] | + dink | () | + doodle | [] [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] [] [] [] | + exif | [] [] [] () [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gip | [] [] [] [] [] [] | + gliv | [] [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gnubiff | [] () [] | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] [] | + gpe-calendar | [] [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] [] | + gpe-edit | [] [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] [] | + hylafax | [] | + idutils | [] [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] () [] [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] | + iso_4217 | [] [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] | + iso_639_3 | [] | + jwhois | [] [] [] [] [] | + kbd | [] [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | [] | + leafpad | [] [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] [] | + libgpewidget | [] [] [] [] | + libgpg-error | [] [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] [] | + libgsasl | [] [] [] [] [] [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] () | + lifelines | [] [] [] | + liferea | [] [] [] [] [] () () [] [] | + lilypond | [] | + linkdr | [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] [] | + man-db | [] [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] | + nano | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] [] | + pies | [] | + popt | [] [] [] [] [] | + psmisc | [] [] [] [] | + pspp | [] [] | + pwdutils | [] [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] [] | + rosegarden | () () () | + rpm | [] [] [] [] | + rush | [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | + shishi | [] | + skencil | [] [] [] | + solfege | [] [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] [] | + vice | [] () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] [] | + wget | [] [] [] [] [] [] [] [] | + wyslij-po | [] [] | + xchat | [] [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +---------------------------------------------------+ + nl nn pa pl ps pt pt_BR ro ru rw sk sl sq sr sv + 132 10 7 96 1 29 60 47 89 3 54 46 8 37 118 + + sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + +-----------------------------------------------+ + a2ps | [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] | 8 + anubis | [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] | 9 + bfd | [] | 5 + bibshelf | [] [] | 16 + binutils | [] [] | 8 + bison | [] | 12 + bison-runtime | [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 3 + buzztard | | 6 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] | 22 + cpio | [] [] [] [] [] | 13 + cppi | [] | 2 + cpplib | [] [] [] [] [] | 13 + cryptsetup | [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] | 30 + dink | | 4 + doodle | [] | 7 + e2fsprogs | [] [] | 11 + enscript | [] [] [] | 17 + exif | [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] | 20 + flex | [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] | 18 + gcal | [] | 5 + gcc | [] [] | 7 + gettext-examples | [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] | 30 + gettext-tools | [] [] [] [] [] | 22 + gip | [] [] [] | 22 + gliv | [] [] | 14 + glunarclock | [] [] [] [] | 19 + gnubiff | [] | 4 + gnucash | () [] () () | 9 + gnuedu | [] [] | 7 + gnulib | [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] | 5 + gnutls | [] [] | 10 + gold | | 3 + gpe-aerial | [] [] | 18 + gpe-beam | [] [] | 19 + gpe-bluetooth | [] [] | 12 + gpe-calendar | [] [] [] | 12 + gpe-clock | [] [] [] [] | 28 + gpe-conf | [] [] [] | 20 + gpe-contacts | [] [] | 17 + gpe-edit | [] [] | 12 + gpe-filemanager | [] [] [] | 16 + gpe-go | [] [] [] [] | 25 + gpe-login | [] [] | 11 + gpe-ownerinfo | [] [] [] [] | 25 + gpe-package | [] [] | 13 + gpe-sketchbook | [] [] | 20 + gpe-su | [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] | 28 + gpe-timesheet | [] [] [] [] | 25 + gpe-today | [] [] [] [] [] | 29 + gpe-todo | [] [] [] | 17 + gphoto2 | [] [] [] [] | 24 + gprof | [] [] | 15 + gpsdrive | [] [] | 11 + gramadoir | [] [] | 11 + grep | [] [] | 6 + grub | [] [] | 9 + gsasl | [] [] [] | 14 + gss | [] [] | 11 + gst-plugins-bad | [] [] [] | 22 + gst-plugins-base | [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] | 25 + gst-plugins-ugly | [] [] [] [] | 29 + gstreamer | [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] | 20 + gtkorphan | [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] | 45 + gutenprint | | 9 + hello | [] [] [] [] [] | 21 + hylafax | [] | 5 + idutils | [] [] [] | 17 + indent | [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] () [] [] () [] [] [] () | 51 + iso_3166_2 | () [] () [] | 7 + iso_4217 | () [] [] () [] [] | 26 + iso_639 | [] [] () [] () [] [] [] [] | 34 + iso_639_3 | [] () | 7 + jwhois | [] [] [] [] | 16 + kbd | [] [] [] [] | 15 + keytouch | [] [] | 15 + keytouch-editor | [] [] | 13 + keytouch-keyboa... | [] [] | 13 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] | 11 + leafpad | [] [] [] [] [] | 33 + libc | [] [] [] [] | 21 + libexif | [] () | 6 + libextractor | [] | 1 + libgnutls | [] [] | 9 + libgpewidget | [] [] | 14 + libgpg-error | [] [] | 9 + libgphoto2 | [] [] | 7 + libgphoto2_port | [] [] [] | 13 + libgsasl | [] [] | 13 + libiconv | [] [] [] | 21 + libidn | [] [] | 11 + lifelines | | 4 + liferea | [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] | 17 + m4 | [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] | 21 + man-db | [] [] | 8 + man-db-manpages | | 4 + minicom | [] | 16 + mkisofs | [] | 7 + nano | [] [] [] | 20 + opcodes | [] [] | 11 + parted | [] [] [] [] | 15 + pies | [] | 2 + popt | [] [] [] [] [] | 27 + psmisc | [] | 12 + pspp | | 4 + pwdutils | [] | 6 + radius | [] [] | 9 + recode | [] [] [] | 28 + rosegarden | | 0 + rpm | [] [] | 11 + rush | [] [] | 3 + screem | [] | 3 + scrollkeeper | [] [] [] [] | 27 + sed | [] [] [] [] | 30 + sharutils | [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] | 7 + solfege | [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] | 23 + texinfo | [] [] [] | 15 + tin | | 4 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux-ng | [] [] [] | 20 + vice | () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] | 6 + wget | [] [] [] [] | 25 + wyslij-po | [] | 6 + xchat | [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] | 57 + xkeyboard-config | [] [] [] | 25 + +-----------------------------------------------+ + 82 teams sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 174 domains 1 3 2 0 10 66 48 149 17 96 7 41 2551 + + Some counters in the preceding matrix are higher than the number of +visible blocks let us expect. This is because a few extra PO files are +used for implementing regional variants of languages, or language +dialects. + + For a PO file in the matrix above to be effective, the package to +which it applies should also have been internationalized and +distributed as such by its maintainer. There might be an observable +lag between the mere existence a PO file and its wide availability in a +distribution. + + If March 2010 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at +`http://translationproject.org/extra/matrix.html'. + +1.6 Using `gettext' in new packages +=================================== + +If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. + + Once the sources are changed appropriately and the setup can handle +the use of `gettext' the only thing missing are the translations. The +Free Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. + diff --git a/AUTHORS b/AUTHORS index 38ed6fe0..1003445b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,7 +14,16 @@ revisions to other modules. including lib/gslextras and the linear regression features. Jason is also an important contributor to GSL, which is used by PSPP. -* Harry Thijssen contributed and maintains the Dutch translation. +* Translators: + + - Dutch: Harry Thijssen. + + - Catalan and Spanish: Palmira Payá Sanchez, Javier Gómez Serrano, + and Francesc Josep Miguel Quesada. + + - British English: John Darrington. + + - Brazilian Portuguese: Michel Almada de Castro Boaventura. We also thank past contributors: diff --git a/INSTALL b/INSTALL index 177e3830..6654e90b 100644 --- a/INSTALL +++ b/INSTALL @@ -33,16 +33,17 @@ The following packages are required to install PSPP: If you don't have a version already, you can install GNU libiconv (http://www.gnu.org/software/libiconv/). - * GNU make (http://www.gnu.org/software/make). Version 3.81 is - known to work; other versions will likely work too. Non-GNU - "make" programs will probably not work. + * libintl, from GNU gettext (http://ww.gnu.org/software/gettext). + GNU libc includes an integrated libintl, so there is no need to + separately install libintl on a GNU/Linux system. -The following package is required to enable PSPP's graphing features. -If you cannot arrange to install it, you must run `configure' with ---without-libplot. +The following packages are required to enable PSPP's graphing +features. If you cannot arrange to install them, you must run +`configure' with --without-cairo. - * libplot, from GNU plotutils - (http://www.gnu.org/software/plotutils/). + * Cairo (http://cairographics.org/), version 1.5 or later. + + * Pango (http://www.pango.org/), version 1.22 or later. The following packages are required to enable PSPPIRE, the graphical user interface for PSPP. If you cannot install them or do not wish to @@ -54,10 +55,6 @@ use the GUI, you must run `configure' with --without-gui. * GTK+ (http://www.gtk.org/), version 2.12.0 or later. - * pkg-config (http://pkg-config.freedesktop.org/wiki/). Versions - 0.18 and 0.19 have a bug that will prevent library detection, - but other versions should be fine. - To cross-compile PSPP, you will likely need to set the PKG_CONFIG_LIBDIR environment variable to point to an appropriate pkg-config for the cross-compilation environment. @@ -69,6 +66,11 @@ Gnumeric files. * libxml2 (http://xmlsoft.org/). +Installing the following packages will allow your PSPP binary to write +OpenDocument text (ODT) files: + + * libxml2 (http://xmlsoft.org/). + The following packages are optional. * libncurses (http://www.gnu.org/software/ncurses/). Without it, @@ -144,9 +146,7 @@ release. `configure', additional features will be available in your PSPP installation. - 2. Type `make' to compile the package. (If GNU make is installed - under a different program name, e.g. "gmake", run that program - instead in this step and in the following steps as well.) + 2. Type `make' to compile the package. 3. Optionally, type `make check' to run the self-tests that come with the package. If any of the self-tests fail, please mail @@ -215,14 +215,17 @@ suffix on their names by giving `configure' the option Optional Features ================= -`--without-libplot' - Don't compile in support for charts (using libplot). This is - useful if your system doesn't have the libplot library. +`--without-cairo' + Don't compile in support for charts (using Cairo and Pango). This + is useful if your system lacks these libraries. `--without-gui' Don't build the PSPPIRE gui. Use this option if you only want to build the command line version of PSPP. + Cairo and Pango required to build the GUI, so --without-cairo + implies --without-gui. + `--with-gui-tools' Build the gui developer tools. There is no reason to use this option unless you're involved with the development of PSPP @@ -234,6 +237,10 @@ Optional Features In these cases you can use --without-lib{xx} to force configure to disregard it. +`--without-perl-module' + Disable building the Perl module, in case it does not build properly + or you do not need it. + `--enable-anachronistic-dependencies' If you use this option, some of the checks for dependent libraries will be relaxed, permitting configure to succeed when older versions diff --git a/Makefile.am b/Makefile.am index 6fca4b1c..78790a43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,15 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- -AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects +AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects -SUBDIRS = gl +SUBDIRS = gl po DISTCLEANFILES = ./po/stamp-po xconfigure BUILT_SOURCES = AM_CPPFLAGS = \ -I$(top_srcdir)/gl \ -I$(top_builddir)/gl \ - -DINSTALLDIR=\"$(bindir)\" \ - -DDOCDIR=\"$(docdir)\" + -DINSTALLDIR=\"$(bindir)\" AM_CFLAGS= @@ -19,8 +18,6 @@ AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \ -Wpointer-arith -Wno-sign-compare -Wmissing-prototypes endif -CC_FOR_BUILD = @CC_FOR_BUILD@ -EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ .q.c: @$(MKDIR_P) `dirname $@` ./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@ @@ -28,7 +25,7 @@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ $(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD) all_q_sources = -pkgsysconfdir = $(sysconfdir)/@PACKAGE@ +pkgsysconfdir = $(sysconfdir)/$(PACKAGE) EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el @@ -36,6 +33,7 @@ EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el CLEANFILES = CLEAN_LOCAL = ALL_LOCAL = +CHECK_LOCAL = ACLOCAL_AMFLAGS = -I m4 -I gl/m4 noinst_LIBRARIES= noinst_LTLIBRARIES= @@ -46,6 +44,7 @@ DIST_HOOKS = INSTALL_DATA_HOOKS = UNINSTALL_DATA_HOOKS = PHONY = +SUFFIXES = .q generate-changelog: if test -d $(top_srcdir)/.git; then \ @@ -61,7 +60,6 @@ DIST_HOOKS += generate-changelog include $(top_srcdir)/po/automake.mk include $(top_srcdir)/lib/automake.mk include $(top_srcdir)/doc/automake.mk -include $(top_srcdir)/config/automake.mk include $(top_srcdir)/examples/automake.mk include $(top_srcdir)/src/automake.mk @@ -87,6 +85,7 @@ uninstall-hook: $(UNINSTALL_DATA_HOOKS) clean-local: $(CLEAN_LOCAL) all-local: $(ALL_LOCAL) +check-local: $(CHECK_LOCAL) # A convenience target to build all the binaries programs: $(PROGRAMS) diff --git a/NEWS b/NEWS index 1aac688c..ce98d876 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,26 @@ PSPP NEWS -- history of user-visible changes. -Time-stamp: <2009-09-08 21:08:29 blp> -Copyright (C) 1996-9, 2000, 2008, 2009 Free Software Foundation, Inc. +Time-stamp: <2010-04-25 21:08:59 blp> +Copyright (C) 1996-9, 2000, 2008, 2009, 2010 Free Software Foundation, Inc. See the end for copying conditions. Please send PSPP bug reports to bug-gnu-pspp@gnu.org. +Changes from 0.7.3 to 0.7.4: + + * The MRSETS command is now implemented. + +Changes from 0.7.2 to 0.7.3: + + * Charts are now produced with Cairo and Pango, instead of libplot. + Without them, the new graphing features will not work. If you do + not have Cairo and Pango installed, you must run `configure' with + --without-cairo. + + * The new "cairo" output driver supports output in PostScript, PDF, + and SVG formats. Its functionality is a superset of that of the + "postscript" driver, which has been removed. You must have Cairo + and Pango installed to build the "cairo" driver. + Changes from 0.7.1 to 0.7.2: * Updated Perl module interface. @@ -54,8 +70,7 @@ Changes from 0.6.2-pre6 to 0.7.0: * A tutorial chapter has been added to the user manual. - -Changes from 0.6.1 to 0.6.2-pre6: +Changes from 0.6.1 to 0.6.2 * New translations: @@ -77,6 +92,8 @@ Changes from 0.6.1 to 0.6.2-pre6: * Build fixes and changes: + - Fix build with GTK+ 2.17.4 and later. + - Make running "make" after running "configure" with different settings reliably rebuild version.c. @@ -100,6 +117,9 @@ Changes from 0.6.1 to 0.6.2-pre6: - Fix writing corrupted .sav files on Windows. + - Fix writing variable labels longer than 252 bytes to save files. + Thanks to Robert Westlund for reporting this bug. + - Fix writing corrupted .por files (bug #26034). - Fix reading .por files whose initial lines are not padded out diff --git a/README b/README index 02e81d77..d1c78db2 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ is a free replacement for the proprietary program SPSS. PSPP development is ongoing. It already supports a large subset of SPSS's syntax. Its statistical procedure support is currently limited, but growing. At your option, PSPP will produce statistical -reports in ASCII, PostScript, or HTML formats. +reports in ASCII, PostScript, PDF, HTML, SVG, or OpenDocument formats. Instructions for PSPP installation are in INSTALL, including a list of prerequisite packages and other PSPP-specific information. Full @@ -52,8 +52,8 @@ following support to users: * Attractive output, including graphs, in a variety of human- and machine-readable formats. PSPP currently produces - output in ASCII, PostScript, and HTML formats. We will - enhance PSPP's output formatting in the future. + output in ASCII, PostScript, PDF, HTML, and SVG formats. We + will enhance PSPP's output formatting in the future. * Good documentation. Currently the PSPP manual describes its language completely, but we would like to add information on diff --git a/README.Git b/README.Git index 753423e3..1a6b9765 100644 --- a/README.Git +++ b/README.Git @@ -34,11 +34,11 @@ This version of PSPP should work with the Gnulib commit shown below. Gnulib does not maintain a stable API or ABI, so it is possible that PSPP will not work with older or newer versions of Gnulib. - commit e21985ad14508137d75b0dccf064adfc4e5888c6 + commit 75dc5a3dbe3c65f57adc9533561100079922e180 Author: Bruno Haible - Date: Mon Sep 28 23:25:49 2009 +0200 + Date: Wed May 19 23:30:18 2010 +0200 - Avoid identifier clash with POSIX function 'remove' defined as a macro. + Clean up dead code in recent commit. To clone Gnulib into a directory named "gnulib" using Git, and then check out this particular commit, run these commands: diff --git a/Smake b/Smake index e8ffdd57..22c0f692 100644 --- a/Smake +++ b/Smake @@ -5,13 +5,14 @@ GNULIB = ../gnulib GNULIB_TOOL = $(GNULIB)/gnulib-tool GNULIB_MODULES = \ - argp \ assert \ byteswap \ c-ctype \ c-strtod \ close \ + configmake \ count-one-bits \ + crc \ crypto/md4 \ dirname \ environ \ @@ -25,9 +26,7 @@ GNULIB_MODULES = \ fseeko \ ftello \ fwriteerror \ - gethostname \ getline \ - getlogin_r \ getopt \ gettext-h \ gettimeofday \ @@ -46,6 +45,7 @@ GNULIB_MODULES = \ mempcpy \ memset \ minmax \ + mkdtemp \ mkstemp \ printf-posix \ printf-safe \ @@ -65,7 +65,6 @@ GNULIB_MODULES = \ strcspn \ strerror \ strftime \ - strsep \ strtod \ strtok_r \ strtol \ @@ -81,6 +80,8 @@ GNULIB_MODULES = \ unistr/u8-strncat \ unlocked-io \ vasprintf-posix \ + version-etc \ + version-etc-fsf \ vfprintf-posix \ vprintf-posix \ vsnprintf \ @@ -138,7 +139,6 @@ po/Makevars.template po/pspp.pot clean: rm -f config.sub config.guess config.rpath - rm -f ABOUT-NLS rm -fr autom4te.cache rm -f aclocal.m4 rm -f missing mkinstalldirs diff --git a/THANKS b/THANKS index 5af73108..baa4354a 100644 --- a/THANKS +++ b/THANKS @@ -13,4 +13,4 @@ Thanks to... * Jim Van Zandt for Debian packaging and suggestions. - * The authors of libplot and libgsl for providing those libraries. + * The coordinators and translators at translationproject.org. diff --git a/TODO b/TODO deleted file mode 100644 index 4889f5d0..00000000 --- a/TODO +++ /dev/null @@ -1,64 +0,0 @@ -Time-stamp: <2006-12-17 18:45:35 blp> - -Get rid of need for GNU diff in `make check'. - -CROSSTABS needs to be re-examined. - -Scratch variables should not be available for use following TEMPORARY. - -Check our results against the NIST StRD benchmark results at -strd.itl.nist.gov/div898/strd - -Storage of value labels on disk is inefficient. Invent new data structure. - -Fix spanned joint cells, i.e., EDLEVEL on crosstabs.stat. - -SELECT IF should be moved before other transformations whenever possible. It -should only be impossible when one of the variables referred to in SELECT IF is -created or modified by a previous transformation. - -Figure out a stylesheet for messages displayed by PSPP: i.e., what quotation -marks around filenames, etc. - -From Zvi Grauer and : - - 1. design of experiments software, specifically Factorial, response surface - methodology and mixrture design. - - These would be EXTREMELY USEFUL for chemists, engineeris, and anyone - involved in the production of chemicals or formulations. - - 2. Multidimensional Scaling analysis (for market analysis) - - - 3. Preference mapping software for market analysis - - 4. Hierarchical clustering (as well as partition clustering) - - 5. Conjoint analysis - - 6. Categorical data analsys ? - -Sometimes very wide (or very tall) columns can occur in tables. What is a good -way to truncate them? It doesn't seem to cause problems for the ascii or -postscript drivers, but it's not good in the general case. Should they be -split somehow? (One way that wide columns can occur is through user request, -for instance through a wide PRINT request--try time-date.stat with a narrow -ascii page or with the postscript driver on letter size paper.) - -From Moshe Braner : An idea regarding MATCH -FILES, again getting BEYOND the state of SPSS: it always bothered me that if I -have a large data file and I want to match it to a small lookup table, via -MATCH FILES FILE= /TABLE= /BY key, I need to SORT the large file on key, do the -match, then (usually) re-sort back into the order I really want it. There is -no reason to do this, when the lookup table is small. Even a dumb sequential -search through the table, for every case in the big file, is better, in some -cases, than the sort. So here's my idea: first look at the /TABLE file, if it -is "small enough", read it into memory, and create an index (or hash table, -whatever) for it. Then read the /FILE and use the index to match to each case. -OTOH, if the /TABLE is too large, then do it the old way, complaining if either -file is not sorted on key. - -Local Variables: -mode: text -fill-column: 79 -End: diff --git a/acinclude.m4 b/acinclude.m4 index 307ce149..14d11dc7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -43,40 +43,6 @@ AC_DEFUN([PSPP_PERL], AC_SUBST([VERSION_FOR_PERL]) ]) -dnl Check that libplot is available. -AC_DEFUN([PSPP_LIBPLOT], -[ - AC_ARG_WITH( - libplot, - [AS_HELP_STRING([--without-libplot], - [don't compile in support of charts (using libplot)])]) - - if test x"$with_libplot" != x"no" ; then - # Check whether we can link against libplot without any extra libraries. - AC_CHECK_LIB(plot, pl_newpl_r, [LIBPLOT_LIBS="-lplot"]) - - # Check whether we can link against libplot if we also link X. - if test x"$LIBPLOT_LIBS" = x""; then - AC_PATH_XTRA - extra_libs="-lXaw -lXmu -lXt $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm" - AC_CHECK_LIB(plot, pl_newpl_r, - [LIBPLOT_LIBS="-lplot $extra_libs" - LDFLAGS="$LDFLAGS $X_LIBS"],, - [$extra_libs]) - fi - - # Still can't link? - if test x"$LIBPLOT_LIBS" = x""; then - PSPP_REQUIRED_PREREQ([libplot (or use --without-libplot)]) - fi - - # Set up to make everything work. - LIBS="$LIBPLOT_LIBS $LIBS" - AC_DEFINE(HAVE_LIBPLOT, 1, - [Define to 1 if you have the `libplot' library (-lplot).]) - fi -]) - dnl PSPP_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED]) dnl Check whether the given C compiler OPTION is accepted. dnl If so, execute ACTION-IF-ACCEPTED, otherwise ACTION-IF-REJECTED. diff --git a/config/OChangeLog b/config/OChangeLog deleted file mode 100644 index dbf6c3ad..00000000 --- a/config/OChangeLog +++ /dev/null @@ -1,217 +0,0 @@ -2007-09-25 Ben Pfaff - - * devices (tty-ascii): Set length and width to "auto", so that - they reflect the current size of the terminal window as it - changes. - -2007-09-22 Ben Pfaff - - Bug #21128. Reviewed by John Darrington. - - * papersize: Removed. - - * automake.mk (dist_pkgsysconf_DATA): Remove papersize. - -2007-08-26 Ben Pfaff - - * devices: Change raw-ascii from screen to listing device (because - that's how it's used). - -2007-07-25 Ben Pfaff - - * devices: Add tty and listing devices that use VT100 (and xterm) - line-drawing characters. - -2007-07-25 Ben Pfaff - - * devices: Add an "interactive" category that defaults to - tty-ascii. Make the tty-ascii device more user-friendly. - -Tue Apr 4 20:20:49 2006 Ben Pfaff - - * automake.mk: Fix bugs in installation targets. - -Mon Apr 3 11:01:16 2006 Ben Pfaff - - * automake.mk: (pkgsysconf_DATA) Add AFM files in config/psfonts. - Remove config/html-prologue, config/ps-prologue. - - * html-prologue: Removed. - - * ps-prologue: Removed. - - * psfonts/Courier-Bold.afm, psfonts/Courier-BoldOblique.afm, - psfonts/Courier-Oblique.afm, psfonts/Courier.afm, - psfonts/Helvetica-Bold.afm, psfonts/Helvetica-BoldOblique.afm, - psfonts/Helvetica-Oblique.afm, psfonts/Helvetica.afm, - psfonts/Times-Bold.afm, psfonts/Times-BoldItalic.afm, - psfonts/Times-Italic.afm, psfonts/Times-Roman.afm: New files. - -Sat Feb 11 21:58:29 2006 Ben Pfaff - - * html-prologue: Don't use ${source-file}, which is no longer - supported. - -Tue Dec 30 22:37:04 2003 Ben Pfaff - - * devices: Add "squeeze=on top-margin=0 bottom-margin=0" to - raw-ascii to make test output more readable. - -Sun May 24 22:40:13 1998 Ben Pfaff - - * ps-prologue: Add %%DocumentMedia: comment. - -Wed May 20 00:02:51 1998 Ben Pfaff - - * ps-prologue: Comment out misleading Bounding-Box comment for - now. SF arguments rearranged. BP removed. - -Wed Apr 15 13:00:46 1998 Ben Pfaff - - * Makefile.am: (private-install) Make it work for separate source - and build directories. - - * ps-prologue: New TL macro for a thick line. New thick-width arg - to BP. - -Sun Jan 4 18:11:11 1998 Ben Pfaff - - * ps-prologue: Minor reorganization. New GB macro to draw a gray - box. - -Wed Dec 24 22:35:13 1997 Ben Pfaff - - * devices: Added devicetype options and documentation for them. - -Fri Dec 5 21:51:08 1997 Ben Pfaff - - * Makefile.am: (pkgsysconf_DATA) Add html-prologue. - (EXTRA_DIST) Add html-prologue. - - * devices: Add `html' device. Add `listing', `screen', and - `printer' flags to devices as appropriate. - - * html-prologue: New file. - - * ps-prologue: Comment fixes. - -Thu Sep 18 21:31:02 1997 Ben Pfaff - - * Makefile.am: (pkgsysconfdir) Changed from $(pkgdatadir) to - $(sysconfdir)/$(PACKAGE). - -Thu Aug 14 22:05:54 1997 Ben Pfaff - - * devices: (tty) Define as null instead of not defining. - -Sun Aug 3 11:33:28 1997 Ben Pfaff - - * devices: tty-ascii has no bold or italic by default. - -Wed Jun 25 22:50:19 1997 Ben Pfaff - - * Makefile.am: (EXTRA_DIST) New target. - -Mon May 5 21:56:54 1997 Ben Pfaff - - * devices, papersize, ps-prologue: Comment fixes. - -Fri May 2 22:05:44 1997 Ben Pfaff - - * Makefile.am: Removed ps-fontmap. - - * ps-fontmap: Removed. - - * ps-prologue: Added comments. Fixed DSC comments. - (BP) Two new arguments; fixed problem with SF argument conflict - with SF function. - -Thu May 1 14:57:52 1997 Ben Pfaff - - * ps-prologue: (BP) New argument, SF or scale factor. - -Fri Apr 18 16:48:41 1997 Ben Pfaff - - * Makefile.am: New file. - - * environment: Comment fix. - -Sat Feb 15 21:26:53 1997 Ben Pfaff - - * devices: Added ml520 and ml520-ul printer devices. - -Sat Jan 11 15:44:15 1997 Ben Pfaff - - * devices: Default listing device is list-ascii, not list-ibmpc. - -Sun Dec 29 21:36:48 1996 Ben Pfaff - - * devices: Changed default devices. - -Sat Sep 7 22:35:12 1996 Ben Pfaff - - * ps-prologue: Added `!encodings' line to cause encodings to be - output. - (T) Fixed. Yes, really this time. - -Thu Sep 5 22:05:56 1996 Ben Pfaff - - * ps-prologue: (T) Now works correctly. - (SF) Parameters changed to: size in psus, target font name, - encoding, PostScript font name. - -Wed Sep 4 21:45:35 1996 Ben Pfaff - - * prologue.ps: Renamed ps-prologue, all references changed. - (T) New definition. - - * ps-encodings: New PostScript configuration file (not present in - distribution). - -Sat Aug 31 23:52:38 1996 Ben Pfaff - - * prologue.ps: One minor comment change. - -Thu Aug 29 21:36:41 1996 Ben Pfaff - - * prologue.ps: Portions other than DSC comments are essentially - completely new. - -Sat Aug 24 23:26:00 1996 Ben Pfaff - - * devices: Added PostScript driver. - -Sun Aug 11 21:31:22 1996 Ben Pfaff - - * prologue.ps: Calls `setlinecap' in setup code. - -Sat Aug 10 23:28:17 1996 Ben Pfaff - - * prologue.ps: DSC comment changes. New call to `setlinewidth' in - setup code. - -Thu Aug 8 22:31:11 1996 Ben Pfaff - - * prologue.ps: Changes to scaling & translating code. - -Sat Aug 3 20:50:35 1996 Ben Pfaff - - * environment: New file. Yet another new time- and memory-hogging - redundant config file; why not? - - * papersize: Comment changes. - - * prologue.ps: Changed vars from $varname$ to ${varname} format. - Miscellaneous changes. - - * ps-fontmap: Comment changes. Fixed ZC family. - -Sat Jul 27 22:32:38 1996 Ben Pfaff - - * ps-fontmap: New configuration file. Added to Makefile.am. - ----------------------------------------------------------------------- -Local Variables: -mode: change-log -version-control: never -End: diff --git a/config/automake.mk b/config/automake.mk deleted file mode 100644 index 88b63ac1..00000000 --- a/config/automake.mk +++ /dev/null @@ -1,22 +0,0 @@ -## Process this file with automake to produce Makefile.in -*- makefile -*- - - -dist_pkgsysconf_DATA = \ - config/devices - -psfontsdir = $(pkgsysconfdir)/psfonts -dist_psfonts_DATA = \ - config/psfonts/Helvetica-Bold.afm \ - config/psfonts/Times-Bold.afm \ - config/psfonts/Courier-Bold.afm \ - config/psfonts/Helvetica-BoldOblique.afm \ - config/psfonts/Times-BoldItalic.afm \ - config/psfonts/Courier-BoldOblique.afm \ - config/psfonts/Helvetica-Oblique.afm \ - config/psfonts/Times-Italic.afm \ - config/psfonts/Courier-Oblique.afm \ - config/psfonts/Helvetica.afm \ - config/psfonts/Times-Roman.afm \ - config/psfonts/Courier.afm - -EXTRA_DIST += config/OChangeLog diff --git a/config/devices b/config/devices deleted file mode 100644 index 48513fe6..00000000 --- a/config/devices +++ /dev/null @@ -1,120 +0,0 @@ -# PSPP's standard output drivers. -# -# An introduction to the use of PSPP output drivers and this file -# follows. However, refer to PSPP's Texinfo documentation for full -# information. -# -# Each output driver specification must be on a single line; however, -# lines may be spliced with a \ at the end of a line. Line splicing -# is performed *before* comments (introduced by `#') are removed. -# -# Format is `DRIVERNAME:CLASSNAME:DEVICETYPE:OPTIONS'. -# -# DRIVERNAME is the name that identifies the driver to the user. It -# is the name used on the -o command-line option. -# -# CLASSNAME is the internal name of the type of driver. Device -# classes can be listed with `pspp -l'. -# -# DEVICETYPE identifies what type or types the devices is. Zero or -# more of the following keywords may be given here: screen, printer, -# or listing. -# -# OPTIONS is a list of key/value pairs to pass to the driver. Use -# spaces to separate pairs, and '=' to separate keys and values. -# Quotes " or ' can be used to delimit values that contain spaces. -# Example: paper-size="Envelope #10" charset=latin1 -# -# Driver categories may be defined with lines of the form: -# -# category=driver1 driver2 driver3 ... driverN -# -# To disable a driver, define a category with nothing on the right -# side. -# -# Macros may be defined with lines of the form: -# -# define macro-name definition -# -# Macros may not be recursive; they may not take arguments. (However, -# `definition' is macro-expanded *at time of definition*.) Macros are -# referenced with $var or ${var} syntax; the latter is preferred. - -# Preferred devices. -default=list-ascii -interactive=tty-ascii - -# Output files. -define tty-output-file "|more" -define list-output-file "pspp.list" - -# Generic ASCII devices -tty-ascii:ascii:screen:squeeze=on headers=off top-margin=0 bottom-margin=0 \ - paginate=off length=auto width=auto output-file=${tty-output-file} -list-ascii:ascii:listing:length=66 width=79 output-file=${list-output-file} -raw-ascii:ascii:listing:width=9999 length=9999 output-file=${list-output-file} \ - emphasis=none headers=off paginate=off squeeze=on \ - top-margin=0 bottom-margin=0 - -# ASCII devices that support bold & underline via backspacing. -tty-ascii-bi:ascii:screen:output-file=${tty-output-file} -list-ascii-bi:ascii:listing:length=66 width=79 output-file=${list-output-file} - -# VT100 graphics devices. -define vt100-graphics \ - init='\033(B\033)0' \ - box[1000]='\16q\17' box[1010]='\16q\17' box[0010]='\16q\17' \ - box[0100]='\16x\17' box[0101]='\16x\17' box[0001]='\16x\17' \ - box[0011]='\16j\17' box[1100]='\16l\17' box[0110]='\16k\17' \ - box[1001]='\16m\17' box[1110]='\16w\17' box[1101]='\16t\17' \ - box[0111]='\16u\17' box[1011]='\16v\17' box[1111]='\16n\17' - -tty-vt100:ascii:screen:squeeze=on headers=off top-margin=0 bottom-margin=0 \ - paginate=off output-file=${tty-output-file} ${vt100-graphics} -list-vt100:ascii:listing:length=66 width=79 output-file=${list-output-file} \ - ${vt100-graphics} - -# HTML device. -html:html:: - -# PostScript device. -list-ps:postscript:: - -# Devices that support the IBM PC line-drawing characters. -define ibmpc-graphics \ - box[0000]='\x20' box[0001]='\xb3' box[0002]='\xba' \ - box[0010]='\xc4' box[0011]='\xd9' box[0012]='\xbd' \ - box[0020]='\xcd' box[0021]='\xbe' box[0022]='\xbc' \ - box[0100]='\xb3' box[0101]='\xb3' box[0102]='\xc4' \ - box[0110]='\xbf' box[0111]='\xb4' box[0112]='\xb6' \ - box[0120]='\xb8' box[0121]='\xb5' box[0122]='\xb9' \ - box[0200]='\xba' box[0201]='\xba' box[0202]='\xba' \ - box[0210]='\xb7' box[0211]='\xb6' box[0212]='\xb6' \ - box[0220]='\xbb' box[0221]='\xb9' box[0222]='\xb9' \ - box[1000]='\xc4' box[1001]='\xc0' box[1002]='\xd3' \ - box[1010]='\xc4' box[1011]='\xc1' box[1012]='\xd0' \ - box[1020]='\xcd' box[1021]='\xcf' box[1022]='\xca' \ - box[1100]='\xda' box[1101]='\xc3' box[1102]='\xc7' \ - box[1110]='\xc2' box[1111]='\xc5' box[1112]='\xd7' \ - box[1120]='\xd1' box[1121]='\xd8' box[1122]='\xce' \ - box[1200]='\xd6' box[1201]='\xc7' box[1202]='\xc7' \ - box[1210]='\xd2' box[1211]='\xd7' box[1212]='\xd7' \ - box[1220]='\xca' box[1221]='\xce' box[1222]='\xce' \ - box[2000]='\xcd' box[2001]='\xd4' box[2002]='\xc8' \ - box[2010]='\xcd' box[2011]='\xcf' box[2012]='\xca' \ - box[2020]='\xcd' box[2021]='\xcf' box[2022]='\xca' \ - box[2100]='\xd5' box[2101]='\xc6' box[2102]='\xcc' \ - box[2110]='\xd1' box[2111]='\xd8' box[2112]='\xce' \ - box[2120]='\xd1' box[2121]='\xd8' box[2122]='\xce' \ - box[2200]='\xc9' box[2201]='\xcc' box[2202]='\xcc' \ - box[2210]='\xcb' box[2211]='\xce' box[2212]='\xce' \ - box[2220]='\xcb' box[2221]='\xce' box[2222]='\xce' - -tty-ibmpc:ascii:screen:length=$viewlength width=$viewwidth ${ibmpc-graphics} \ - output-file=${tty-output-file} -list-ibmpc:ascii:listing:length=66 width=79 output-file=${list-output-file} \ - ${ibmpc-graphics} - -# Local Variables: -# fill-prefix: "# " -# End: diff --git a/config/psfonts/Courier-Bold.afm b/config/psfonts/Courier-Bold.afm deleted file mode 100644 index dbfdddb2..00000000 --- a/config/psfonts/Courier-Bold.afm +++ /dev/null @@ -1,348 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1989 1990 Adobe Systems Incorporated. All rights reserved. -Comment Creation Date: Thu Jan 18 16:13:14 1990 -Comment UniqueID 27058 -Comment VMusage 28444 40812 -FontName Courier-Bold -FullName Courier Bold -FamilyName Courier -Weight Bold -ItalicAngle 0 -IsFixedPitch true -FontBBox -40 -206 786 801 -UnderlinePosition -100 -UnderlineThickness 50 -Version 002.003 -Notice Copyright (c) 1989 1990 Adobe Systems Incorporated. All rights reserved. -EncodingScheme AdobeStandardEncoding -CapHeight 562 -XHeight 439 -Ascender 626 -Descender -142 -StartCharMetrics 260 -C 32 ; WX 600 ; N space ; B 0 0 0 0 ; -C 33 ; WX 600 ; N exclam ; B 212 -15 388 572 ; -C 34 ; WX 600 ; N quotedbl ; B 145 297 455 562 ; -C 35 ; WX 600 ; N numbersign ; B 66 -45 534 651 ; -C 36 ; WX 600 ; N dollar ; B 92 -126 509 666 ; -C 37 ; WX 600 ; N percent ; B 5 -15 595 616 ; -C 38 ; WX 600 ; N ampersand ; B 46 -15 536 543 ; -C 39 ; WX 600 ; N quoteright ; B 188 297 412 562 ; -C 40 ; WX 600 ; N parenleft ; B 229 -102 451 616 ; -C 41 ; WX 600 ; N parenright ; B 149 -102 371 616 ; -C 42 ; WX 600 ; N asterisk ; B 91 219 509 601 ; -C 43 ; WX 600 ; N plus ; B 81 0 519 439 ; -C 44 ; WX 600 ; N comma ; B 140 -101 374 164 ; -C 45 ; WX 600 ; N hyphen ; B 110 213 490 303 ; -C 46 ; WX 600 ; N period ; B 206 -15 394 151 ; -C 47 ; WX 600 ; N slash ; B 105 -77 496 626 ; -C 48 ; WX 600 ; N zero ; B 97 -15 503 616 ; -C 49 ; WX 600 ; N one ; B 91 0 529 616 ; -C 50 ; WX 600 ; N two ; B 71 0 489 616 ; -C 51 ; WX 600 ; N three ; B 73 -15 491 616 ; -C 52 ; WX 600 ; N four ; B 63 0 497 616 ; -C 53 ; WX 600 ; N five ; B 80 -15 511 601 ; -C 54 ; WX 600 ; N six ; B 100 -15 511 616 ; -C 55 ; WX 600 ; N seven ; B 65 0 484 601 ; -C 56 ; WX 600 ; N eight ; B 93 -15 507 616 ; -C 57 ; WX 600 ; N nine ; B 89 -15 500 616 ; -C 58 ; WX 600 ; N colon ; B 206 -15 394 405 ; -C 59 ; WX 600 ; N semicolon ; B 140 -101 394 405 ; -C 60 ; WX 600 ; N less ; B 66 -15 503 453 ; -C 61 ; WX 600 ; N equal ; B 81 89 519 349 ; -C 62 ; WX 600 ; N greater ; B 97 -15 534 453 ; -C 63 ; WX 600 ; N question ; B 108 -15 491 580 ; -C 64 ; WX 600 ; N at ; B 26 -15 574 616 ; -C 65 ; WX 600 ; N A ; B 1 0 599 562 ; -C 66 ; WX 600 ; N B ; B 40 0 563 562 ; -C 67 ; WX 600 ; N C ; B 32 -18 554 580 ; -C 68 ; WX 600 ; N D ; B 40 0 584 562 ; -C 69 ; WX 600 ; N E ; B 40 0 545 562 ; -C 70 ; WX 600 ; N F ; B 54 0 555 562 ; -C 71 ; WX 600 ; N G ; B 32 -18 584 580 ; -C 72 ; WX 600 ; N H ; B 30 0 570 562 ; -C 73 ; WX 600 ; N I ; B 87 0 513 562 ; -C 74 ; WX 600 ; N J ; B 47 -18 591 562 ; -C 75 ; WX 600 ; N K ; B 36 0 584 562 ; -C 76 ; WX 600 ; N L ; B 49 0 568 562 ; -C 77 ; WX 600 ; N M ; B 3 0 597 562 ; -C 78 ; WX 600 ; N N ; B 18 -12 600 562 ; -C 79 ; WX 600 ; N O ; B 32 -18 568 580 ; -C 80 ; WX 600 ; N P ; B 58 0 549 562 ; -C 81 ; WX 600 ; N Q ; B 32 -123 568 580 ; -C 82 ; WX 600 ; N R ; B 34 0 589 562 ; -C 83 ; WX 600 ; N S ; B 57 -22 543 582 ; -C 84 ; WX 600 ; N T ; B 31 0 569 562 ; -C 85 ; WX 600 ; N U ; B 14 -18 586 562 ; -C 86 ; WX 600 ; N V ; B -3 0 603 562 ; -C 87 ; WX 600 ; N W ; B -8 0 608 562 ; -C 88 ; WX 600 ; N X ; B 22 0 578 562 ; -C 89 ; WX 600 ; N Y ; B 22 0 579 562 ; -C 90 ; WX 600 ; N Z ; B 72 0 529 562 ; -C 91 ; WX 600 ; N bracketleft ; B 255 -102 465 616 ; -C 92 ; WX 600 ; N backslash ; B 105 -77 496 626 ; -C 93 ; WX 600 ; N bracketright ; B 135 -102 345 616 ; -C 94 ; WX 600 ; N asciicircum ; B 108 249 492 616 ; -C 95 ; WX 600 ; N underscore ; B 0 -125 600 -75 ; -C 96 ; WX 600 ; N quoteleft ; B 188 297 412 562 ; -C 97 ; WX 600 ; N a ; B 45 -15 560 454 ; -C 98 ; WX 600 ; N b ; B 10 -15 574 626 ; -C 99 ; WX 600 ; N c ; B 50 -15 539 459 ; -C 100 ; WX 600 ; N d ; B 30 -15 581 626 ; -C 101 ; WX 600 ; N e ; B 50 -15 553 454 ; -C 102 ; WX 600 ; N f ; B 93 0 537 626 ; L i fi ; L l fl ; -C 103 ; WX 600 ; N g ; B 40 -146 570 454 ; -C 104 ; WX 600 ; N h ; B 15 0 582 626 ; -C 105 ; WX 600 ; N i ; B 87 0 513 648 ; -C 106 ; WX 600 ; N j ; B 73 -146 430 648 ; -C 107 ; WX 600 ; N k ; B 30 0 575 626 ; -C 108 ; WX 600 ; N l ; B 87 0 513 626 ; -C 109 ; WX 600 ; N m ; B -12 0 616 454 ; -C 110 ; WX 600 ; N n ; B 28 0 582 454 ; -C 111 ; WX 600 ; N o ; B 40 -15 560 454 ; -C 112 ; WX 600 ; N p ; B 9 -142 560 454 ; -C 113 ; WX 600 ; N q ; B 30 -142 581 454 ; -C 114 ; WX 600 ; N r ; B 57 0 570 454 ; -C 115 ; WX 600 ; N s ; B 78 -17 525 459 ; -C 116 ; WX 600 ; N t ; B 57 -15 522 562 ; -C 117 ; WX 600 ; N u ; B 9 -15 559 439 ; -C 118 ; WX 600 ; N v ; B 9 0 591 439 ; -C 119 ; WX 600 ; N w ; B -8 0 608 439 ; -C 120 ; WX 600 ; N x ; B 16 0 584 439 ; -C 121 ; WX 600 ; N y ; B 6 -142 591 439 ; -C 122 ; WX 600 ; N z ; B 91 0 510 439 ; -C 123 ; WX 600 ; N braceleft ; B 170 -102 454 616 ; -C 124 ; WX 600 ; N bar ; B 255 -77 345 626 ; -C 125 ; WX 600 ; N braceright ; B 146 -102 430 616 ; -C 126 ; WX 600 ; N asciitilde ; B 81 124 520 307 ; -C 161 ; WX 600 ; N exclamdown ; B 212 -146 388 449 ; -C 162 ; WX 600 ; N cent ; B 76 -49 508 614 ; -C 163 ; WX 600 ; N sterling ; B 82 -28 548 611 ; -C 164 ; WX 600 ; N fraction ; B 30 -60 571 661 ; -C 165 ; WX 600 ; N yen ; B 20 0 580 591 ; -C 166 ; WX 600 ; N florin ; B -20 -131 562 616 ; -C 167 ; WX 600 ; N section ; B 103 -70 497 580 ; -C 168 ; WX 600 ; N currency ; B 54 49 546 517 ; -C 169 ; WX 600 ; N quotesingle ; B 237 297 363 562 ; -C 170 ; WX 600 ; N quotedblleft ; B 81 297 519 562 ; -C 171 ; WX 600 ; N guillemotleft ; B 8 70 553 446 ; -C 172 ; WX 600 ; N guilsinglleft ; B 141 70 459 446 ; -C 173 ; WX 600 ; N guilsinglright ; B 141 70 459 446 ; -C 174 ; WX 600 ; N fi ; B 22 0 583 626 ; -C 175 ; WX 600 ; N fl ; B 22 0 583 626 ; -C 177 ; WX 600 ; N endash ; B 75 213 525 303 ; -C 178 ; WX 600 ; N dagger ; B 116 -70 484 580 ; -C 179 ; WX 600 ; N daggerdbl ; B 116 -70 484 580 ; -C 180 ; WX 600 ; N periodcentered ; B 206 136 394 302 ; -C 182 ; WX 600 ; N paragraph ; B 16 -70 566 580 ; -C 183 ; WX 600 ; N bullet ; B 150 142 450 420 ; -C 184 ; WX 600 ; N quotesinglbase ; B 188 -140 412 125 ; -C 185 ; WX 600 ; N quotedblbase ; B 81 -140 519 125 ; -C 186 ; WX 600 ; N quotedblright ; B 81 297 519 562 ; -C 187 ; WX 600 ; N guillemotright ; B 47 70 592 446 ; -C 188 ; WX 600 ; N ellipsis ; B 36 -15 564 96 ; -C 189 ; WX 600 ; N perthousand ; B -40 -15 786 616 ; -C 191 ; WX 600 ; N questiondown ; B 109 -146 492 449 ; -C 193 ; WX 600 ; N grave ; B 132 508 395 661 ; -C 194 ; WX 600 ; N acute ; B 205 508 468 661 ; -C 195 ; WX 600 ; N circumflex ; B 103 483 497 657 ; -C 196 ; WX 600 ; N tilde ; B 89 493 512 636 ; -C 197 ; WX 600 ; N macron ; B 88 505 512 585 ; -C 198 ; WX 600 ; N breve ; B 83 468 517 631 ; -C 199 ; WX 600 ; N dotaccent ; B 240 505 360 625 ; -C 200 ; WX 600 ; N dieresis ; B 148 505 452 625 ; -C 202 ; WX 600 ; N ring ; B 198 481 402 678 ; -C 203 ; WX 600 ; N cedilla ; B 205 -206 387 0 ; -C 205 ; WX 600 ; N hungarumlaut ; B 95 508 578 661 ; -C 206 ; WX 600 ; N ogonek ; B 169 -199 367 0 ; -C 207 ; WX 600 ; N caron ; B 103 493 497 667 ; -C 208 ; WX 600 ; N emdash ; B 0 213 600 303 ; -C 225 ; WX 600 ; N AE ; B -29 0 562 562 ; -C 227 ; WX 600 ; N ordfeminine ; B 147 196 453 580 ; -C 232 ; WX 600 ; N Lslash ; B 49 0 568 562 ; -C 233 ; WX 600 ; N Oslash ; B 32 -22 568 584 ; -C 234 ; WX 600 ; N OE ; B 0 0 570 562 ; -C 235 ; WX 600 ; N ordmasculine ; B 147 196 453 580 ; -C 241 ; WX 600 ; N ae ; B 6 -15 591 454 ; -C 245 ; WX 600 ; N dotlessi ; B 87 0 513 439 ; -C 248 ; WX 600 ; N lslash ; B 87 0 513 626 ; -C 249 ; WX 600 ; N oslash ; B 40 -24 560 463 ; -C 250 ; WX 600 ; N oe ; B -8 -15 601 454 ; -C 251 ; WX 600 ; N germandbls ; B 32 -15 586 626 ; -C -1 ; WX 600 ; N scedilla ; B 78 -206 525 459 ; -C -1 ; WX 600 ; N notegraphic ; B 87 -15 513 572 ; -C -1 ; WX 600 ; N Ocircumflex ; B 32 -18 568 780 ; -C -1 ; WX 600 ; N ll ; B -2 0 590 626 ; -C -1 ; WX 600 ; N otilde ; B 40 -15 560 636 ; -C -1 ; WX 600 ; N scaron ; B 78 -17 525 667 ; -C -1 ; WX 600 ; N divide ; B 81 -15 519 453 ; -C -1 ; WX 600 ; N Thorn ; B 58 0 547 562 ; -C -1 ; WX 600 ; N format ; B 5 -146 95 598 ; -C -1 ; WX 600 ; N largebullet ; B 258 239 342 323 ; -C -1 ; WX 600 ; N Eth ; B 40 0 584 562 ; -C -1 ; WX 600 ; N Odieresis ; B 32 -18 568 748 ; -C -1 ; WX 600 ; N onesuperior ; B 158 230 442 616 ; -C -1 ; WX 600 ; N dectab ; B 18 0 582 290 ; -C -1 ; WX 600 ; N Ydieresis ; B 22 0 579 748 ; -C -1 ; WX 600 ; N merge ; B 144 -15 456 487 ; -C -1 ; WX 600 ; N IJ ; B 2 -18 612 562 ; -C -1 ; WX 600 ; N ccedilla ; B 50 -206 539 459 ; -C -1 ; WX 600 ; N multiply ; B 81 0 520 439 ; -C -1 ; WX 600 ; N degree ; B 86 243 474 616 ; -C -1 ; WX 600 ; N prescription ; B 34 -15 589 562 ; -C -1 ; WX 600 ; N indent ; B 70 52 530 364 ; -C -1 ; WX 600 ; N Otilde ; B 32 -18 568 759 ; -C -1 ; WX 600 ; N thorn ; B -4 -142 560 626 ; -C -1 ; WX 600 ; N mu ; B 9 -142 559 439 ; -C -1 ; WX 600 ; N Yacute ; B 22 0 579 784 ; -C -1 ; WX 600 ; N threesuperior ; B 148 222 423 616 ; -C -1 ; WX 600 ; N logicalnot ; B 81 59 519 349 ; -C -1 ; WX 600 ; N Ugrave ; B 14 -18 586 784 ; -C -1 ; WX 600 ; N eth ; B 68 -27 533 626 ; -C -1 ; WX 600 ; N left ; B 70 52 530 364 ; -C -1 ; WX 600 ; N Ecircumflex ; B 40 0 545 780 ; -C -1 ; WX 600 ; N edieresis ; B 50 -15 553 625 ; -C -1 ; WX 600 ; N Ograve ; B 32 -18 568 784 ; -C -1 ; WX 600 ; N down ; B 144 -15 456 422 ; -C -1 ; WX 600 ; N Agrave ; B 1 0 599 784 ; -C -1 ; WX 600 ; N atilde ; B 45 -15 560 636 ; -C -1 ; WX 600 ; N up ; B 144 0 456 437 ; -C -1 ; WX 600 ; N eacute ; B 50 -15 553 661 ; -C -1 ; WX 600 ; N graybox ; B 76 0 525 599 ; -C -1 ; WX 600 ; N lira ; B 82 -28 548 611 ; -C -1 ; WX 600 ; N Icircumflex ; B 87 0 513 780 ; -C -1 ; WX 600 ; N Adieresis ; B 1 0 599 748 ; -C -1 ; WX 600 ; N yacute ; B 6 -142 591 661 ; -C -1 ; WX 600 ; N icircumflex ; B 63 0 513 657 ; -C -1 ; WX 600 ; N adieresis ; B 45 -15 560 625 ; -C -1 ; WX 600 ; N zcaron ; B 91 0 510 667 ; -C -1 ; WX 600 ; N Scaron ; B 57 -22 543 790 ; -C -1 ; WX 600 ; N minus ; B 81 174 519 264 ; -C -1 ; WX 600 ; N Aring ; B 1 0 599 801 ; -C -1 ; WX 600 ; N Ucircumflex ; B 14 -18 586 780 ; -C -1 ; WX 600 ; N plusminus ; B 81 0 519 461 ; -C -1 ; WX 600 ; N ograve ; B 40 -15 560 661 ; -C -1 ; WX 600 ; N Edieresis ; B 40 0 545 748 ; -C -1 ; WX 600 ; N brokenbar ; B 255 -77 345 626 ; -C -1 ; WX 600 ; N Idieresis ; B 87 0 513 748 ; -C -1 ; WX 600 ; N acircumflex ; B 45 -15 560 657 ; -C -1 ; WX 600 ; N ydieresis ; B 6 -142 591 625 ; -C -1 ; WX 600 ; N Oacute ; B 32 -18 568 784 ; -C -1 ; WX 600 ; N Egrave ; B 40 0 545 784 ; -C -1 ; WX 600 ; N center ; B 40 14 560 580 ; -C -1 ; WX 600 ; N threequarters ; B -20 -60 675 661 ; -C -1 ; WX 600 ; N tab ; B 19 0 581 562 ; -C -1 ; WX 600 ; N ecircumflex ; B 50 -15 553 657 ; -C -1 ; WX 600 ; N Eacute ; B 40 0 545 784 ; -C -1 ; WX 600 ; N trademark ; B -9 230 749 562 ; -C -1 ; WX 600 ; N square ; B 19 0 581 562 ; -C -1 ; WX 600 ; N onehalf ; B -20 -60 675 661 ; -C -1 ; WX 600 ; N onequarter ; B -20 -60 692 661 ; -C -1 ; WX 600 ; N Uacute ; B 14 -18 586 784 ; -C -1 ; WX 600 ; N Atilde ; B 1 0 599 759 ; -C -1 ; WX 600 ; N copyright ; B 0 -18 600 580 ; -C -1 ; WX 600 ; N Igrave ; B 87 0 513 784 ; -C -1 ; WX 600 ; N Iacute ; B 87 0 513 784 ; -C -1 ; WX 600 ; N Acircumflex ; B 1 0 599 780 ; -C -1 ; WX 600 ; N Udieresis ; B 14 -18 586 748 ; -C -1 ; WX 600 ; N Gcaron ; B 32 -18 584 790 ; -C -1 ; WX 600 ; N Aacute ; B 1 0 599 784 ; -C -1 ; WX 600 ; N LL ; B -35 0 635 562 ; -C -1 ; WX 600 ; N twosuperior ; B 153 230 426 616 ; -C -1 ; WX 600 ; N Scedilla ; B 57 -206 543 582 ; -C -1 ; WX 600 ; N arrowboth ; B -24 143 624 455 ; -C -1 ; WX 600 ; N udieresis ; B 9 -15 559 625 ; -C -1 ; WX 600 ; N odieresis ; B 40 -15 560 625 ; -C -1 ; WX 600 ; N aring ; B 45 -15 560 678 ; -C -1 ; WX 600 ; N ij ; B 16 -146 564 648 ; -C -1 ; WX 600 ; N arrowdown ; B 144 -15 456 608 ; -C -1 ; WX 600 ; N igrave ; B 87 0 513 661 ; -C -1 ; WX 600 ; N aacute ; B 45 -15 560 661 ; -C -1 ; WX 600 ; N stop ; B 19 0 581 562 ; -C -1 ; WX 600 ; N ocircumflex ; B 40 -15 560 657 ; -C -1 ; WX 600 ; N gcaron ; B 40 -146 570 667 ; -C -1 ; WX 600 ; N iacute ; B 87 0 513 661 ; -C -1 ; WX 600 ; N Ntilde ; B 18 -12 600 759 ; -C -1 ; WX 600 ; N idieresis ; B 87 0 513 625 ; -C -1 ; WX 600 ; N Ccedilla ; B 32 -206 554 580 ; -C -1 ; WX 600 ; N arrowright ; B -24 143 624 455 ; -C -1 ; WX 600 ; N ucircumflex ; B 9 -15 559 657 ; -C -1 ; WX 600 ; N Idot ; B 87 0 513 748 ; -C -1 ; WX 600 ; N agrave ; B 45 -15 560 661 ; -C -1 ; WX 600 ; N ntilde ; B 28 0 582 636 ; -C -1 ; WX 600 ; N registered ; B 0 -18 600 580 ; -C -1 ; WX 600 ; N return ; B 19 0 581 562 ; -C -1 ; WX 600 ; N Zcaron ; B 72 0 529 790 ; -C -1 ; WX 600 ; N uacute ; B 9 -15 559 661 ; -C -1 ; WX 600 ; N overscore ; B 0 579 600 629 ; -C -1 ; WX 600 ; N egrave ; B 50 -15 553 661 ; -C -1 ; WX 600 ; N ugrave ; B 9 -15 559 661 ; -C -1 ; WX 600 ; N oacute ; B 40 -15 560 661 ; -C -1 ; WX 600 ; N arrowleft ; B -24 143 624 455 ; -C -1 ; WX 600 ; N arrowup ; B 144 0 456 623 ; -EndCharMetrics -StartComposites 62 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 30 123 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -30 123 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis -20 123 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave -50 123 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring -10 123 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde -30 123 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 0 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 30 123 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 0 123 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 0 123 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 0 123 ; -CC Gcaron 2 ; PCC G 0 0 ; PCC caron 10 123 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 0 123 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 0 123 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 0 123 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 0 123 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 0 123 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 0 123 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 0 123 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 0 123 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 0 123 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 0 123 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 0 123 ; -CC Scedilla 2 ; PCC S 0 0 ; PCC cedilla 20 0 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 30 123 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 0 123 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 0 123 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave -30 123 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 30 123 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 0 123 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 0 123 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 0 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex -20 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis -10 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave -30 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 0 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 0 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 0 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 0 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 0 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 0 0 ; -CC gcaron 2 ; PCC g 0 0 ; PCC caron -40 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute 0 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -40 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -40 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave 0 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 0 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 0 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ; -CC scedilla 2 ; PCC s 0 0 ; PCC cedilla 0 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 0 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -20 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis -20 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave -30 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 30 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 10 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 0 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Courier-BoldOblique.afm b/config/psfonts/Courier-BoldOblique.afm deleted file mode 100644 index 77e50d78..00000000 --- a/config/psfonts/Courier-BoldOblique.afm +++ /dev/null @@ -1,348 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1989 1990 Adobe Systems Incorporated. All rights reserved. -Comment Creation Date: Thu Jan 18 17:20:38 1990 -Comment UniqueID 27068 -Comment VMusage 6910 48006 -FontName Courier-BoldOblique -FullName Courier Bold Oblique -FamilyName Courier -Weight Bold -ItalicAngle -12 -IsFixedPitch true -FontBBox -46 -206 868 801 -UnderlinePosition -100 -UnderlineThickness 50 -Version 002.003 -Notice Copyright (c) 1989 1990 Adobe Systems Incorporated. All rights reserved. -EncodingScheme AdobeStandardEncoding -CapHeight 562 -XHeight 439 -Ascender 626 -Descender -142 -StartCharMetrics 260 -C 32 ; WX 600 ; N space ; B 0 0 0 0 ; -C 33 ; WX 600 ; N exclam ; B 224 -15 484 572 ; -C 34 ; WX 600 ; N quotedbl ; B 226 297 574 562 ; -C 35 ; WX 600 ; N numbersign ; B 100 -45 628 651 ; -C 36 ; WX 600 ; N dollar ; B 97 -126 619 666 ; -C 37 ; WX 600 ; N percent ; B 103 -15 624 616 ; -C 38 ; WX 600 ; N ampersand ; B 72 -15 582 543 ; -C 39 ; WX 600 ; N quoteright ; B 251 297 531 562 ; -C 40 ; WX 600 ; N parenleft ; B 276 -102 582 616 ; -C 41 ; WX 600 ; N parenright ; B 127 -102 434 616 ; -C 42 ; WX 600 ; N asterisk ; B 179 219 597 601 ; -C 43 ; WX 600 ; N plus ; B 118 0 575 439 ; -C 44 ; WX 600 ; N comma ; B 119 -101 409 164 ; -C 45 ; WX 600 ; N hyphen ; B 155 213 554 303 ; -C 46 ; WX 600 ; N period ; B 219 -15 410 151 ; -C 47 ; WX 600 ; N slash ; B 96 -77 622 626 ; -C 48 ; WX 600 ; N zero ; B 146 -15 583 616 ; -C 49 ; WX 600 ; N one ; B 103 0 547 616 ; -C 50 ; WX 600 ; N two ; B 71 0 583 616 ; -C 51 ; WX 600 ; N three ; B 82 -15 561 616 ; -C 52 ; WX 600 ; N four ; B 92 0 544 616 ; -C 53 ; WX 600 ; N five ; B 87 -15 611 601 ; -C 54 ; WX 600 ; N six ; B 146 -15 642 616 ; -C 55 ; WX 600 ; N seven ; B 157 0 612 601 ; -C 56 ; WX 600 ; N eight ; B 125 -15 594 616 ; -C 57 ; WX 600 ; N nine ; B 86 -15 582 616 ; -C 58 ; WX 600 ; N colon ; B 219 -15 464 405 ; -C 59 ; WX 600 ; N semicolon ; B 119 -101 464 405 ; -C 60 ; WX 600 ; N less ; B 113 -15 584 453 ; -C 61 ; WX 600 ; N equal ; B 100 89 593 349 ; -C 62 ; WX 600 ; N greater ; B 109 -15 581 453 ; -C 63 ; WX 600 ; N question ; B 193 -15 581 580 ; -C 64 ; WX 600 ; N at ; B 76 -15 627 616 ; -C 65 ; WX 600 ; N A ; B 1 0 617 562 ; -C 66 ; WX 600 ; N B ; B 40 0 619 562 ; -C 67 ; WX 600 ; N C ; B 85 -18 664 580 ; -C 68 ; WX 600 ; N D ; B 40 0 654 562 ; -C 69 ; WX 600 ; N E ; B 40 0 654 562 ; -C 70 ; WX 600 ; N F ; B 54 0 668 562 ; -C 71 ; WX 600 ; N G ; B 85 -18 664 580 ; -C 72 ; WX 600 ; N H ; B 30 0 689 562 ; -C 73 ; WX 600 ; N I ; B 87 0 632 562 ; -C 74 ; WX 600 ; N J ; B 69 -18 710 562 ; -C 75 ; WX 600 ; N K ; B 36 0 676 562 ; -C 76 ; WX 600 ; N L ; B 49 0 625 562 ; -C 77 ; WX 600 ; N M ; B 3 0 716 562 ; -C 78 ; WX 600 ; N N ; B 18 -12 719 562 ; -C 79 ; WX 600 ; N O ; B 84 -18 636 580 ; -C 80 ; WX 600 ; N P ; B 58 0 634 562 ; -C 81 ; WX 600 ; N Q ; B 84 -123 636 580 ; -C 82 ; WX 600 ; N R ; B 34 0 607 562 ; -C 83 ; WX 600 ; N S ; B 64 -22 662 582 ; -C 84 ; WX 600 ; N T ; B 96 0 668 562 ; -C 85 ; WX 600 ; N U ; B 116 -18 705 562 ; -C 86 ; WX 600 ; N V ; B 99 0 722 562 ; -C 87 ; WX 600 ; N W ; B 94 0 727 562 ; -C 88 ; WX 600 ; N X ; B 22 0 679 562 ; -C 89 ; WX 600 ; N Y ; B 124 0 698 562 ; -C 90 ; WX 600 ; N Z ; B 72 0 626 562 ; -C 91 ; WX 600 ; N bracketleft ; B 233 -102 596 616 ; -C 92 ; WX 600 ; N backslash ; B 231 -77 487 626 ; -C 93 ; WX 600 ; N bracketright ; B 113 -102 476 616 ; -C 94 ; WX 600 ; N asciicircum ; B 171 249 555 616 ; -C 95 ; WX 600 ; N underscore ; B -27 -125 584 -75 ; -C 96 ; WX 600 ; N quoteleft ; B 251 297 531 562 ; -C 97 ; WX 600 ; N a ; B 72 -15 578 454 ; -C 98 ; WX 600 ; N b ; B 23 -15 626 626 ; -C 99 ; WX 600 ; N c ; B 91 -15 621 459 ; -C 100 ; WX 600 ; N d ; B 71 -15 634 626 ; -C 101 ; WX 600 ; N e ; B 91 -15 594 454 ; -C 102 ; WX 600 ; N f ; B 93 0 667 626 ; L i fi ; L l fl ; -C 103 ; WX 600 ; N g ; B 51 -146 663 454 ; -C 104 ; WX 600 ; N h ; B 28 0 600 626 ; -C 105 ; WX 600 ; N i ; B 87 0 531 648 ; -C 106 ; WX 600 ; N j ; B 47 -146 568 648 ; -C 107 ; WX 600 ; N k ; B 43 0 632 626 ; -C 108 ; WX 600 ; N l ; B 87 0 531 626 ; -C 109 ; WX 600 ; N m ; B -12 0 634 454 ; -C 110 ; WX 600 ; N n ; B 28 0 600 454 ; -C 111 ; WX 600 ; N o ; B 81 -15 612 454 ; -C 112 ; WX 600 ; N p ; B -21 -142 612 454 ; -C 113 ; WX 600 ; N q ; B 71 -142 674 454 ; -C 114 ; WX 600 ; N r ; B 57 0 644 454 ; -C 115 ; WX 600 ; N s ; B 77 -17 597 459 ; -C 116 ; WX 600 ; N t ; B 132 -15 556 562 ; -C 117 ; WX 600 ; N u ; B 84 -15 577 439 ; -C 118 ; WX 600 ; N v ; B 84 0 684 439 ; -C 119 ; WX 600 ; N w ; B 67 0 701 439 ; -C 120 ; WX 600 ; N x ; B 16 0 660 439 ; -C 121 ; WX 600 ; N y ; B -10 -142 684 439 ; -C 122 ; WX 600 ; N z ; B 91 0 603 439 ; -C 123 ; WX 600 ; N braceleft ; B 216 -102 585 616 ; -C 124 ; WX 600 ; N bar ; B 239 -77 478 626 ; -C 125 ; WX 600 ; N braceright ; B 124 -102 494 616 ; -C 126 ; WX 600 ; N asciitilde ; B 120 124 573 307 ; -C 161 ; WX 600 ; N exclamdown ; B 207 -146 468 449 ; -C 162 ; WX 600 ; N cent ; B 131 -49 594 614 ; -C 163 ; WX 600 ; N sterling ; B 117 -28 640 611 ; -C 164 ; WX 600 ; N fraction ; B 27 -60 702 661 ; -C 165 ; WX 600 ; N yen ; B 110 0 706 591 ; -C 166 ; WX 600 ; N florin ; B -46 -131 691 616 ; -C 167 ; WX 600 ; N section ; B 94 -70 599 580 ; -C 168 ; WX 600 ; N currency ; B 77 49 643 517 ; -C 169 ; WX 600 ; N quotesingle ; B 318 297 482 562 ; -C 170 ; WX 600 ; N quotedblleft ; B 144 297 638 562 ; -C 171 ; WX 600 ; N guillemotleft ; B 63 70 638 446 ; -C 172 ; WX 600 ; N guilsinglleft ; B 196 70 544 446 ; -C 173 ; WX 600 ; N guilsinglright ; B 166 70 514 446 ; -C 174 ; WX 600 ; N fi ; B 22 0 633 626 ; -C 175 ; WX 600 ; N fl ; B 22 0 633 626 ; -C 177 ; WX 600 ; N endash ; B 120 213 589 303 ; -C 178 ; WX 600 ; N dagger ; B 188 -70 573 580 ; -C 179 ; WX 600 ; N daggerdbl ; B 134 -70 574 580 ; -C 180 ; WX 600 ; N periodcentered ; B 251 136 442 302 ; -C 182 ; WX 600 ; N paragraph ; B 71 -70 689 580 ; -C 183 ; WX 600 ; N bullet ; B 207 142 513 420 ; -C 184 ; WX 600 ; N quotesinglbase ; B 158 -140 439 125 ; -C 185 ; WX 600 ; N quotedblbase ; B 51 -140 546 125 ; -C 186 ; WX 600 ; N quotedblright ; B 144 297 638 562 ; -C 187 ; WX 600 ; N guillemotright ; B 72 70 647 446 ; -C 188 ; WX 600 ; N ellipsis ; B 43 -15 574 96 ; -C 189 ; WX 600 ; N perthousand ; B 24 -15 815 616 ; -C 191 ; WX 600 ; N questiondown ; B 111 -146 499 449 ; -C 193 ; WX 600 ; N grave ; B 272 508 503 661 ; -C 194 ; WX 600 ; N acute ; B 313 508 608 661 ; -C 195 ; WX 600 ; N circumflex ; B 212 483 606 657 ; -C 196 ; WX 600 ; N tilde ; B 200 493 642 636 ; -C 197 ; WX 600 ; N macron ; B 195 505 636 585 ; -C 198 ; WX 600 ; N breve ; B 217 468 651 631 ; -C 199 ; WX 600 ; N dotaccent ; B 359 505 482 625 ; -C 200 ; WX 600 ; N dieresis ; B 267 505 574 625 ; -C 202 ; WX 600 ; N ring ; B 319 481 528 678 ; -C 203 ; WX 600 ; N cedilla ; B 169 -206 367 0 ; -C 205 ; WX 600 ; N hungarumlaut ; B 203 508 718 661 ; -C 206 ; WX 600 ; N ogonek ; B 144 -199 350 0 ; -C 207 ; WX 600 ; N caron ; B 238 493 632 667 ; -C 208 ; WX 600 ; N emdash ; B 45 213 664 303 ; -C 225 ; WX 600 ; N AE ; B -29 0 667 562 ; -C 227 ; WX 600 ; N ordfeminine ; B 189 196 526 580 ; -C 232 ; WX 600 ; N Lslash ; B 49 0 625 562 ; -C 233 ; WX 600 ; N Oslash ; B 48 -22 672 584 ; -C 234 ; WX 600 ; N OE ; B 51 0 675 562 ; -C 235 ; WX 600 ; N ordmasculine ; B 189 196 542 580 ; -C 241 ; WX 600 ; N ae ; B 30 -15 641 454 ; -C 245 ; WX 600 ; N dotlessi ; B 87 0 531 439 ; -C 248 ; WX 600 ; N lslash ; B 87 0 574 626 ; -C 249 ; WX 600 ; N oslash ; B 54 -24 637 463 ; -C 250 ; WX 600 ; N oe ; B 29 -15 651 454 ; -C 251 ; WX 600 ; N germandbls ; B 32 -15 618 626 ; -C -1 ; WX 600 ; N scedilla ; B 77 -206 597 459 ; -C -1 ; WX 600 ; N notegraphic ; B 99 -15 609 572 ; -C -1 ; WX 600 ; N Ocircumflex ; B 84 -18 636 780 ; -C -1 ; WX 600 ; N ll ; B 11 0 643 626 ; -C -1 ; WX 600 ; N otilde ; B 81 -15 642 636 ; -C -1 ; WX 600 ; N scaron ; B 77 -17 632 667 ; -C -1 ; WX 600 ; N divide ; B 118 -15 575 453 ; -C -1 ; WX 600 ; N Thorn ; B 58 0 613 562 ; -C -1 ; WX 600 ; N format ; B -26 -146 222 598 ; -C -1 ; WX 600 ; N largebullet ; B 317 239 403 323 ; -C -1 ; WX 600 ; N Eth ; B 40 0 654 562 ; -C -1 ; WX 600 ; N Odieresis ; B 84 -18 636 748 ; -C -1 ; WX 600 ; N onesuperior ; B 218 230 506 616 ; -C -1 ; WX 600 ; N dectab ; B 18 0 601 290 ; -C -1 ; WX 600 ; N Ydieresis ; B 124 0 698 748 ; -C -1 ; WX 600 ; N merge ; B 174 -15 526 487 ; -C -1 ; WX 600 ; N IJ ; B 2 -18 731 562 ; -C -1 ; WX 600 ; N ccedilla ; B 91 -206 621 459 ; -C -1 ; WX 600 ; N multiply ; B 94 0 600 439 ; -C -1 ; WX 600 ; N degree ; B 173 243 569 616 ; -C -1 ; WX 600 ; N prescription ; B 34 -15 632 562 ; -C -1 ; WX 600 ; N indent ; B 106 52 574 364 ; -C -1 ; WX 600 ; N Otilde ; B 84 -18 668 759 ; -C -1 ; WX 600 ; N thorn ; B -21 -142 612 626 ; -C -1 ; WX 600 ; N mu ; B 60 -142 577 439 ; -C -1 ; WX 600 ; N Yacute ; B 124 0 698 784 ; -C -1 ; WX 600 ; N threesuperior ; B 203 222 515 616 ; -C -1 ; WX 600 ; N logicalnot ; B 136 59 593 349 ; -C -1 ; WX 600 ; N Ugrave ; B 116 -18 705 784 ; -C -1 ; WX 600 ; N eth ; B 103 -27 651 626 ; -C -1 ; WX 600 ; N left ; B 114 52 582 364 ; -C -1 ; WX 600 ; N Ecircumflex ; B 40 0 654 780 ; -C -1 ; WX 600 ; N edieresis ; B 91 -15 594 625 ; -C -1 ; WX 600 ; N Ograve ; B 84 -18 636 784 ; -C -1 ; WX 600 ; N down ; B 174 -15 486 422 ; -C -1 ; WX 600 ; N Agrave ; B 1 0 617 784 ; -C -1 ; WX 600 ; N atilde ; B 72 -15 642 636 ; -C -1 ; WX 600 ; N up ; B 204 0 516 437 ; -C -1 ; WX 600 ; N eacute ; B 91 -15 608 661 ; -C -1 ; WX 600 ; N graybox ; B 76 0 652 599 ; -C -1 ; WX 600 ; N lira ; B 117 -28 640 611 ; -C -1 ; WX 600 ; N Icircumflex ; B 87 0 632 780 ; -C -1 ; WX 600 ; N Adieresis ; B 1 0 617 748 ; -C -1 ; WX 600 ; N yacute ; B -10 -142 684 661 ; -C -1 ; WX 600 ; N icircumflex ; B 87 0 566 657 ; -C -1 ; WX 600 ; N adieresis ; B 72 -15 578 625 ; -C -1 ; WX 600 ; N zcaron ; B 91 0 632 667 ; -C -1 ; WX 600 ; N Scaron ; B 64 -22 662 790 ; -C -1 ; WX 600 ; N minus ; B 118 174 575 264 ; -C -1 ; WX 600 ; N Aring ; B 1 0 617 801 ; -C -1 ; WX 600 ; N Ucircumflex ; B 116 -18 705 780 ; -C -1 ; WX 600 ; N plusminus ; B 81 0 592 461 ; -C -1 ; WX 600 ; N ograve ; B 81 -15 612 661 ; -C -1 ; WX 600 ; N Edieresis ; B 40 0 654 748 ; -C -1 ; WX 600 ; N brokenbar ; B 239 -77 478 626 ; -C -1 ; WX 600 ; N Idieresis ; B 87 0 632 748 ; -C -1 ; WX 600 ; N acircumflex ; B 72 -15 586 657 ; -C -1 ; WX 600 ; N ydieresis ; B -10 -142 684 625 ; -C -1 ; WX 600 ; N Oacute ; B 84 -18 636 784 ; -C -1 ; WX 600 ; N Egrave ; B 40 0 654 784 ; -C -1 ; WX 600 ; N center ; B 103 14 623 580 ; -C -1 ; WX 600 ; N threequarters ; B 35 -60 725 661 ; -C -1 ; WX 600 ; N tab ; B 19 0 641 562 ; -C -1 ; WX 600 ; N ecircumflex ; B 91 -15 606 657 ; -C -1 ; WX 600 ; N Eacute ; B 40 0 665 784 ; -C -1 ; WX 600 ; N trademark ; B 86 230 868 562 ; -C -1 ; WX 600 ; N square ; B 19 0 700 562 ; -C -1 ; WX 600 ; N onehalf ; B 50 -60 742 661 ; -C -1 ; WX 600 ; N onequarter ; B 50 -60 742 661 ; -C -1 ; WX 600 ; N Uacute ; B 116 -18 705 784 ; -C -1 ; WX 600 ; N Atilde ; B 1 0 638 759 ; -C -1 ; WX 600 ; N copyright ; B 53 -18 667 580 ; -C -1 ; WX 600 ; N Igrave ; B 87 0 632 784 ; -C -1 ; WX 600 ; N Iacute ; B 87 0 635 784 ; -C -1 ; WX 600 ; N Acircumflex ; B 1 0 617 780 ; -C -1 ; WX 600 ; N Udieresis ; B 116 -18 705 748 ; -C -1 ; WX 600 ; N Gcaron ; B 85 -18 669 790 ; -C -1 ; WX 600 ; N Aacute ; B 1 0 665 784 ; -C -1 ; WX 600 ; N LL ; B -35 0 684 562 ; -C -1 ; WX 600 ; N twosuperior ; B 202 230 531 616 ; -C -1 ; WX 600 ; N Scedilla ; B 64 -206 662 582 ; -C -1 ; WX 600 ; N arrowboth ; B 40 143 688 455 ; -C -1 ; WX 600 ; N udieresis ; B 84 -15 577 625 ; -C -1 ; WX 600 ; N odieresis ; B 81 -15 612 625 ; -C -1 ; WX 600 ; N aring ; B 72 -15 578 678 ; -C -1 ; WX 600 ; N ij ; B 16 -146 702 648 ; -C -1 ; WX 600 ; N arrowdown ; B 174 -15 486 608 ; -C -1 ; WX 600 ; N igrave ; B 87 0 531 661 ; -C -1 ; WX 600 ; N aacute ; B 72 -15 608 661 ; -C -1 ; WX 600 ; N stop ; B 19 0 700 562 ; -C -1 ; WX 600 ; N ocircumflex ; B 81 -15 612 657 ; -C -1 ; WX 600 ; N gcaron ; B 51 -146 663 667 ; -C -1 ; WX 600 ; N iacute ; B 87 0 608 661 ; -C -1 ; WX 600 ; N Ntilde ; B 18 -12 719 759 ; -C -1 ; WX 600 ; N idieresis ; B 87 0 534 625 ; -C -1 ; WX 600 ; N Ccedilla ; B 85 -206 664 580 ; -C -1 ; WX 600 ; N arrowright ; B 32 143 688 455 ; -C -1 ; WX 600 ; N ucircumflex ; B 84 -15 586 657 ; -C -1 ; WX 600 ; N Idot ; B 87 0 632 748 ; -C -1 ; WX 600 ; N agrave ; B 72 -15 578 661 ; -C -1 ; WX 600 ; N ntilde ; B 28 0 642 636 ; -C -1 ; WX 600 ; N registered ; B 53 -18 667 580 ; -C -1 ; WX 600 ; N return ; B 79 0 700 562 ; -C -1 ; WX 600 ; N Zcaron ; B 72 0 659 790 ; -C -1 ; WX 600 ; N uacute ; B 84 -15 608 661 ; -C -1 ; WX 600 ; N overscore ; B 123 579 734 629 ; -C -1 ; WX 600 ; N egrave ; B 91 -15 594 661 ; -C -1 ; WX 600 ; N ugrave ; B 84 -15 577 661 ; -C -1 ; WX 600 ; N oacute ; B 81 -15 612 661 ; -C -1 ; WX 600 ; N arrowleft ; B 40 143 695 455 ; -C -1 ; WX 600 ; N arrowup ; B 243 0 555 623 ; -EndCharMetrics -StartComposites 62 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 56 123 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -4 123 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 6 123 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave -24 123 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 16 123 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde -4 123 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 0 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 56 123 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 26 123 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 26 123 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 26 123 ; -CC Gcaron 2 ; PCC G 0 0 ; PCC caron 36 123 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 26 123 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 26 123 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 26 123 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 26 123 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 26 123 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 26 123 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 26 123 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 26 123 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 26 123 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 26 123 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 26 123 ; -CC Scedilla 2 ; PCC S 0 0 ; PCC cedilla 20 0 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 56 123 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 26 123 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 26 123 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave -4 123 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 56 123 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 26 123 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 26 123 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 0 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex -20 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis -10 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave -30 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 0 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 0 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 0 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 0 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 0 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 0 0 ; -CC gcaron 2 ; PCC g 0 0 ; PCC caron -40 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute 0 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -40 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -40 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave 0 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 0 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 0 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ; -CC scedilla 2 ; PCC s 0 0 ; PCC cedilla 0 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 0 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -20 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis -20 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave -30 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 30 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 10 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 0 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Courier-Oblique.afm b/config/psfonts/Courier-Oblique.afm deleted file mode 100644 index 4dc94197..00000000 --- a/config/psfonts/Courier-Oblique.afm +++ /dev/null @@ -1,348 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1989, 1990 Adobe Systems Incorporated. All rights reserved. -Comment Creation Date: Thu Jan 18 18:32:01 1990 -Comment UniqueID 27082 -Comment VMusage 6415 46660 -FontName Courier-Oblique -FullName Courier Oblique -FamilyName Courier -Weight Medium -ItalicAngle -12 -IsFixedPitch true -FontBBox -30 -157 734 805 -UnderlinePosition -100 -UnderlineThickness 50 -Version 002.003 -Notice Copyright (c) 1989, 1990 Adobe Systems Incorporated. All rights reserved. -EncodingScheme AdobeStandardEncoding -CapHeight 562 -XHeight 426 -Ascender 629 -Descender -157 -StartCharMetrics 260 -C 32 ; WX 600 ; N space ; B 0 0 0 0 ; -C 33 ; WX 600 ; N exclam ; B 243 -15 457 572 ; -C 34 ; WX 600 ; N quotedbl ; B 273 328 532 562 ; -C 35 ; WX 600 ; N numbersign ; B 142 -32 587 639 ; -C 36 ; WX 600 ; N dollar ; B 115 -126 589 662 ; -C 37 ; WX 600 ; N percent ; B 147 -15 596 622 ; -C 38 ; WX 600 ; N ampersand ; B 94 -15 572 543 ; -C 39 ; WX 600 ; N quoteright ; B 283 328 495 562 ; -C 40 ; WX 600 ; N parenleft ; B 320 -108 565 622 ; -C 41 ; WX 600 ; N parenright ; B 144 -108 389 622 ; -C 42 ; WX 600 ; N asterisk ; B 212 257 580 607 ; -C 43 ; WX 600 ; N plus ; B 128 0 562 426 ; -C 44 ; WX 600 ; N comma ; B 157 -112 370 122 ; -C 45 ; WX 600 ; N hyphen ; B 161 238 549 278 ; -C 46 ; WX 600 ; N period ; B 238 -15 382 109 ; -C 47 ; WX 600 ; N slash ; B 111 -80 606 629 ; -C 48 ; WX 600 ; N zero ; B 161 -15 568 622 ; -C 49 ; WX 600 ; N one ; B 105 0 505 622 ; -C 50 ; WX 600 ; N two ; B 77 0 561 622 ; -C 51 ; WX 600 ; N three ; B 89 -15 531 622 ; -C 52 ; WX 600 ; N four ; B 120 0 532 622 ; -C 53 ; WX 600 ; N five ; B 105 -15 589 607 ; -C 54 ; WX 600 ; N six ; B 162 -15 629 622 ; -C 55 ; WX 600 ; N seven ; B 191 0 605 607 ; -C 56 ; WX 600 ; N eight ; B 139 -15 581 622 ; -C 57 ; WX 600 ; N nine ; B 100 -15 567 622 ; -C 58 ; WX 600 ; N colon ; B 238 -15 441 385 ; -C 59 ; WX 600 ; N semicolon ; B 157 -112 441 385 ; -C 60 ; WX 600 ; N less ; B 86 -2 603 428 ; -C 61 ; WX 600 ; N equal ; B 108 101 582 325 ; -C 62 ; WX 600 ; N greater ; B 87 -2 604 428 ; -C 63 ; WX 600 ; N question ; B 224 -15 576 572 ; -C 64 ; WX 600 ; N at ; B 134 -15 575 622 ; -C 65 ; WX 600 ; N A ; B 10 0 597 562 ; -C 66 ; WX 600 ; N B ; B 50 0 609 562 ; -C 67 ; WX 600 ; N C ; B 100 -18 651 580 ; -C 68 ; WX 600 ; N D ; B 50 0 638 562 ; -C 69 ; WX 600 ; N E ; B 60 0 653 562 ; -C 70 ; WX 600 ; N F ; B 60 0 653 562 ; -C 71 ; WX 600 ; N G ; B 90 -18 641 580 ; -C 72 ; WX 600 ; N H ; B 39 0 680 562 ; -C 73 ; WX 600 ; N I ; B 103 0 616 562 ; -C 74 ; WX 600 ; N J ; B 59 -18 678 562 ; -C 75 ; WX 600 ; N K ; B 45 0 664 562 ; -C 76 ; WX 600 ; N L ; B 54 0 598 562 ; -C 77 ; WX 600 ; N M ; B 11 0 708 562 ; -C 78 ; WX 600 ; N N ; B 14 -13 705 562 ; -C 79 ; WX 600 ; N O ; B 94 -18 625 580 ; -C 80 ; WX 600 ; N P ; B 86 0 637 562 ; -C 81 ; WX 600 ; N Q ; B 95 -129 625 580 ; -C 82 ; WX 600 ; N R ; B 45 0 590 562 ; -C 83 ; WX 600 ; N S ; B 83 -20 643 580 ; -C 84 ; WX 600 ; N T ; B 116 0 658 562 ; -C 85 ; WX 600 ; N U ; B 132 -18 695 562 ; -C 86 ; WX 600 ; N V ; B 115 -13 716 562 ; -C 87 ; WX 600 ; N W ; B 115 -13 716 562 ; -C 88 ; WX 600 ; N X ; B 30 0 668 562 ; -C 89 ; WX 600 ; N Y ; B 143 0 688 562 ; -C 90 ; WX 600 ; N Z ; B 86 0 610 562 ; -C 91 ; WX 600 ; N bracketleft ; B 253 -108 574 622 ; -C 92 ; WX 600 ; N backslash ; B 256 -80 461 629 ; -C 93 ; WX 600 ; N bracketright ; B 135 -108 456 622 ; -C 94 ; WX 600 ; N asciicircum ; B 175 359 587 622 ; -C 95 ; WX 600 ; N underscore ; B -27 -125 584 -75 ; -C 96 ; WX 600 ; N quoteleft ; B 294 328 506 562 ; -C 97 ; WX 600 ; N a ; B 83 -15 559 441 ; -C 98 ; WX 600 ; N b ; B 36 -15 618 629 ; -C 99 ; WX 600 ; N c ; B 113 -15 607 441 ; -C 100 ; WX 600 ; N d ; B 92 -15 633 629 ; -C 101 ; WX 600 ; N e ; B 113 -15 591 441 ; -C 102 ; WX 600 ; N f ; B 121 0 655 629 ; L i fi ; L l fl ; -C 103 ; WX 600 ; N g ; B 68 -157 650 441 ; -C 104 ; WX 600 ; N h ; B 40 0 582 629 ; -C 105 ; WX 600 ; N i ; B 102 0 505 657 ; -C 106 ; WX 600 ; N j ; B 59 -157 543 657 ; -C 107 ; WX 600 ; N k ; B 65 0 626 629 ; -C 108 ; WX 600 ; N l ; B 102 0 505 629 ; -C 109 ; WX 600 ; N m ; B 2 0 606 441 ; -C 110 ; WX 600 ; N n ; B 33 0 575 441 ; -C 111 ; WX 600 ; N o ; B 102 -15 588 441 ; -C 112 ; WX 600 ; N p ; B -17 -157 598 441 ; -C 113 ; WX 600 ; N q ; B 92 -157 675 441 ; -C 114 ; WX 600 ; N r ; B 67 0 631 441 ; -C 115 ; WX 600 ; N s ; B 92 -15 570 441 ; -C 116 ; WX 600 ; N t ; B 157 -15 534 561 ; -C 117 ; WX 600 ; N u ; B 111 -15 562 426 ; -C 118 ; WX 600 ; N v ; B 100 -10 674 426 ; -C 119 ; WX 600 ; N w ; B 82 -10 692 426 ; -C 120 ; WX 600 ; N x ; B 27 0 648 426 ; -C 121 ; WX 600 ; N y ; B -30 -157 643 426 ; -C 122 ; WX 600 ; N z ; B 106 0 586 426 ; -C 123 ; WX 600 ; N braceleft ; B 240 -108 562 622 ; -C 124 ; WX 600 ; N bar ; B 265 -80 453 629 ; -C 125 ; WX 600 ; N braceright ; B 147 -108 470 622 ; -C 126 ; WX 600 ; N asciitilde ; B 110 160 585 269 ; -C 161 ; WX 600 ; N exclamdown ; B 232 -157 445 430 ; -C 162 ; WX 600 ; N cent ; B 158 -49 581 614 ; -C 163 ; WX 600 ; N sterling ; B 131 -21 614 611 ; -C 164 ; WX 600 ; N fraction ; B 23 -57 706 665 ; -C 165 ; WX 600 ; N yen ; B 135 0 693 594 ; -C 166 ; WX 600 ; N florin ; B -19 -143 664 622 ; -C 167 ; WX 600 ; N section ; B 111 -78 583 580 ; -C 168 ; WX 600 ; N currency ; B 99 65 621 499 ; -C 169 ; WX 600 ; N quotesingle ; B 345 328 460 562 ; -C 170 ; WX 600 ; N quotedblleft ; B 213 328 576 562 ; -C 171 ; WX 600 ; N guillemotleft ; B 92 70 652 446 ; -C 172 ; WX 600 ; N guilsinglleft ; B 204 70 540 446 ; -C 173 ; WX 600 ; N guilsinglright ; B 170 70 506 446 ; -C 174 ; WX 600 ; N fi ; B 10 0 612 629 ; -C 175 ; WX 600 ; N fl ; B 10 0 612 629 ; -C 177 ; WX 600 ; N endash ; B 126 238 584 278 ; -C 178 ; WX 600 ; N dagger ; B 226 -78 537 580 ; -C 179 ; WX 600 ; N daggerdbl ; B 171 -78 537 580 ; -C 180 ; WX 600 ; N periodcentered ; B 273 152 418 276 ; -C 182 ; WX 600 ; N paragraph ; B 107 -78 623 562 ; -C 183 ; WX 600 ; N bullet ; B 231 137 478 376 ; -C 184 ; WX 600 ; N quotesinglbase ; B 185 -134 397 100 ; -C 185 ; WX 600 ; N quotedblbase ; B 115 -134 478 100 ; -C 186 ; WX 600 ; N quotedblright ; B 213 328 576 562 ; -C 187 ; WX 600 ; N guillemotright ; B 58 70 618 446 ; -C 188 ; WX 600 ; N ellipsis ; B 51 -15 566 97 ; -C 189 ; WX 600 ; N perthousand ; B 57 -15 627 622 ; -C 191 ; WX 600 ; N questiondown ; B 112 -157 464 430 ; -C 193 ; WX 600 ; N grave ; B 294 497 484 672 ; -C 194 ; WX 600 ; N acute ; B 348 497 612 672 ; -C 195 ; WX 600 ; N circumflex ; B 229 477 581 654 ; -C 196 ; WX 600 ; N tilde ; B 219 503 617 606 ; -C 197 ; WX 600 ; N macron ; B 232 525 600 565 ; -C 198 ; WX 600 ; N breve ; B 279 501 576 609 ; -C 199 ; WX 600 ; N dotaccent ; B 379 508 452 580 ; -C 200 ; WX 600 ; N dieresis ; B 313 508 519 580 ; -C 202 ; WX 600 ; N ring ; B 344 483 492 627 ; -C 203 ; WX 600 ; N cedilla ; B 221 -151 340 10 ; -C 205 ; WX 600 ; N hungarumlaut ; B 239 497 683 672 ; -C 206 ; WX 600 ; N ogonek ; B 207 -151 348 0 ; -C 207 ; WX 600 ; N caron ; B 262 492 614 669 ; -C 208 ; WX 600 ; N emdash ; B 51 238 659 278 ; -C 225 ; WX 600 ; N AE ; B 10 0 648 562 ; -C 227 ; WX 600 ; N ordfeminine ; B 216 259 504 580 ; -C 232 ; WX 600 ; N Lslash ; B 54 0 598 562 ; -C 233 ; WX 600 ; N Oslash ; B 94 -80 625 629 ; -C 234 ; WX 600 ; N OE ; B 66 0 665 562 ; -C 235 ; WX 600 ; N ordmasculine ; B 217 259 530 580 ; -C 241 ; WX 600 ; N ae ; B 47 -15 620 441 ; -C 245 ; WX 600 ; N dotlessi ; B 102 0 505 426 ; -C 248 ; WX 600 ; N lslash ; B 102 0 559 629 ; -C 249 ; WX 600 ; N oslash ; B 102 -80 588 506 ; -C 250 ; WX 600 ; N oe ; B 61 -15 609 441 ; -C 251 ; WX 600 ; N germandbls ; B 55 -15 610 629 ; -C -1 ; WX 600 ; N scedilla ; B 92 -151 570 441 ; -C -1 ; WX 600 ; N notegraphic ; B 143 -15 557 572 ; -C -1 ; WX 600 ; N Ocircumflex ; B 94 -18 625 775 ; -C -1 ; WX 600 ; N ll ; B 40 0 609 629 ; -C -1 ; WX 600 ; N otilde ; B 102 -15 617 606 ; -C -1 ; WX 600 ; N scaron ; B 92 -15 614 669 ; -C -1 ; WX 600 ; N divide ; B 128 1 562 426 ; -C -1 ; WX 600 ; N Thorn ; B 86 0 599 562 ; -C -1 ; WX 600 ; N format ; B -28 -157 169 598 ; -C -1 ; WX 600 ; N largebullet ; B 322 227 388 290 ; -C -1 ; WX 600 ; N Eth ; B 50 0 638 562 ; -C -1 ; WX 600 ; N Odieresis ; B 94 -18 625 716 ; -C -1 ; WX 600 ; N onesuperior ; B 238 249 481 622 ; -C -1 ; WX 600 ; N dectab ; B 18 0 590 227 ; -C -1 ; WX 600 ; N Ydieresis ; B 143 0 688 716 ; -C -1 ; WX 600 ; N merge ; B 192 -15 497 436 ; -C -1 ; WX 600 ; N IJ ; B 39 -18 681 562 ; -C -1 ; WX 600 ; N ccedilla ; B 113 -151 607 441 ; -C -1 ; WX 600 ; N multiply ; B 93 -1 599 426 ; -C -1 ; WX 600 ; N degree ; B 214 269 576 622 ; -C -1 ; WX 600 ; N prescription ; B 34 -15 610 562 ; -C -1 ; WX 600 ; N indent ; B 110 75 574 341 ; -C -1 ; WX 600 ; N Otilde ; B 94 -18 644 732 ; -C -1 ; WX 600 ; N thorn ; B -17 -157 598 629 ; -C -1 ; WX 600 ; N mu ; B 79 -157 562 426 ; -C -1 ; WX 600 ; N Yacute ; B 143 0 688 793 ; -C -1 ; WX 600 ; N threesuperior ; B 220 240 494 622 ; -C -1 ; WX 600 ; N logicalnot ; B 148 64 582 325 ; -C -1 ; WX 600 ; N Ugrave ; B 132 -18 695 793 ; -C -1 ; WX 600 ; N eth ; B 102 -15 629 629 ; -C -1 ; WX 600 ; N left ; B 114 75 578 341 ; -C -1 ; WX 600 ; N Ecircumflex ; B 60 0 653 775 ; -C -1 ; WX 600 ; N edieresis ; B 113 -15 591 580 ; -C -1 ; WX 600 ; N Ograve ; B 94 -18 625 793 ; -C -1 ; WX 600 ; N down ; B 192 -15 458 422 ; -C -1 ; WX 600 ; N Agrave ; B 10 0 597 793 ; -C -1 ; WX 600 ; N atilde ; B 83 -15 617 606 ; -C -1 ; WX 600 ; N up ; B 232 0 498 437 ; -C -1 ; WX 600 ; N eacute ; B 113 -15 612 672 ; -C -1 ; WX 600 ; N graybox ; B 76 0 652 599 ; -C -1 ; WX 600 ; N lira ; B 125 -21 614 611 ; -C -1 ; WX 600 ; N Icircumflex ; B 103 0 616 775 ; -C -1 ; WX 600 ; N Adieresis ; B 10 0 597 716 ; -C -1 ; WX 600 ; N yacute ; B -30 -157 643 672 ; -C -1 ; WX 600 ; N icircumflex ; B 102 0 551 654 ; -C -1 ; WX 600 ; N adieresis ; B 83 -15 559 580 ; -C -1 ; WX 600 ; N zcaron ; B 106 0 624 669 ; -C -1 ; WX 600 ; N Scaron ; B 83 -20 673 805 ; -C -1 ; WX 600 ; N minus ; B 128 195 562 232 ; -C -1 ; WX 600 ; N Aring ; B 10 0 597 753 ; -C -1 ; WX 600 ; N Ucircumflex ; B 132 -18 695 775 ; -C -1 ; WX 600 ; N plusminus ; B 87 0 583 514 ; -C -1 ; WX 600 ; N ograve ; B 102 -15 588 672 ; -C -1 ; WX 600 ; N Edieresis ; B 60 0 653 716 ; -C -1 ; WX 600 ; N brokenbar ; B 265 -80 453 629 ; -C -1 ; WX 600 ; N Idieresis ; B 103 0 616 716 ; -C -1 ; WX 600 ; N acircumflex ; B 83 -15 581 654 ; -C -1 ; WX 600 ; N ydieresis ; B -30 -157 643 580 ; -C -1 ; WX 600 ; N Oacute ; B 94 -18 638 793 ; -C -1 ; WX 600 ; N Egrave ; B 60 0 653 793 ; -C -1 ; WX 600 ; N center ; B 103 14 623 580 ; -C -1 ; WX 600 ; N threequarters ; B 28 -57 711 665 ; -C -1 ; WX 600 ; N tab ; B 19 0 641 562 ; -C -1 ; WX 600 ; N ecircumflex ; B 113 -15 591 654 ; -C -1 ; WX 600 ; N Eacute ; B 60 0 668 793 ; -C -1 ; WX 600 ; N trademark ; B 108 263 710 562 ; -C -1 ; WX 600 ; N square ; B 19 0 700 562 ; -C -1 ; WX 600 ; N onehalf ; B 42 -57 725 665 ; -C -1 ; WX 600 ; N onequarter ; B 48 -57 731 665 ; -C -1 ; WX 600 ; N Uacute ; B 132 -18 695 793 ; -C -1 ; WX 600 ; N Atilde ; B 10 0 644 732 ; -C -1 ; WX 600 ; N copyright ; B 53 -18 667 580 ; -C -1 ; WX 600 ; N Igrave ; B 103 0 616 793 ; -C -1 ; WX 600 ; N Iacute ; B 103 0 638 793 ; -C -1 ; WX 600 ; N Acircumflex ; B 10 0 597 775 ; -C -1 ; WX 600 ; N Udieresis ; B 132 -18 695 716 ; -C -1 ; WX 600 ; N Gcaron ; B 90 -18 643 805 ; -C -1 ; WX 600 ; N Aacute ; B 10 0 658 793 ; -C -1 ; WX 600 ; N LL ; B 15 0 640 562 ; -C -1 ; WX 600 ; N twosuperior ; B 237 249 528 622 ; -C -1 ; WX 600 ; N Scedilla ; B 83 -151 643 580 ; -C -1 ; WX 600 ; N arrowboth ; B 36 122 692 476 ; -C -1 ; WX 600 ; N udieresis ; B 111 -15 562 580 ; -C -1 ; WX 600 ; N odieresis ; B 102 -15 588 580 ; -C -1 ; WX 600 ; N aring ; B 83 -15 559 627 ; -C -1 ; WX 600 ; N ij ; B 44 -157 623 657 ; -C -1 ; WX 600 ; N arrowdown ; B 157 -15 511 608 ; -C -1 ; WX 600 ; N igrave ; B 102 0 505 672 ; -C -1 ; WX 600 ; N aacute ; B 83 -15 612 672 ; -C -1 ; WX 600 ; N stop ; B 19 0 700 562 ; -C -1 ; WX 600 ; N ocircumflex ; B 102 -15 588 654 ; -C -1 ; WX 600 ; N gcaron ; B 68 -157 650 669 ; -C -1 ; WX 600 ; N iacute ; B 102 0 612 672 ; -C -1 ; WX 600 ; N Ntilde ; B 14 -13 705 732 ; -C -1 ; WX 600 ; N idieresis ; B 102 0 505 580 ; -C -1 ; WX 600 ; N Ccedilla ; B 100 -151 651 580 ; -C -1 ; WX 600 ; N arrowright ; B 35 122 688 476 ; -C -1 ; WX 600 ; N ucircumflex ; B 111 -15 571 654 ; -C -1 ; WX 600 ; N Idot ; B 103 0 616 716 ; -C -1 ; WX 600 ; N agrave ; B 83 -15 559 672 ; -C -1 ; WX 600 ; N ntilde ; B 33 0 617 606 ; -C -1 ; WX 600 ; N registered ; B 53 -18 667 580 ; -C -1 ; WX 600 ; N return ; B 79 0 700 562 ; -C -1 ; WX 600 ; N Zcaron ; B 86 0 643 805 ; -C -1 ; WX 600 ; N uacute ; B 111 -15 602 672 ; -C -1 ; WX 600 ; N overscore ; B 123 579 734 629 ; -C -1 ; WX 600 ; N egrave ; B 113 -15 591 672 ; -C -1 ; WX 600 ; N ugrave ; B 111 -15 562 672 ; -C -1 ; WX 600 ; N oacute ; B 102 -15 612 672 ; -C -1 ; WX 600 ; N arrowleft ; B 40 122 692 476 ; -C -1 ; WX 600 ; N arrowup ; B 218 0 572 623 ; -EndCharMetrics -StartComposites 62 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 46 121 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -4 121 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis -1 136 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave -4 121 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 12 126 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 27 126 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 0 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 56 121 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 26 121 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 29 136 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 26 121 ; -CC Gcaron 2 ; PCC G 0 0 ; PCC caron 29 136 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 26 121 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 26 121 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 29 136 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 26 121 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 27 126 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 26 121 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 26 121 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 29 136 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 26 121 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 27 126 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 59 136 ; -CC Scedilla 2 ; PCC S 0 0 ; PCC cedilla 0 0 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 56 121 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 26 121 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 29 136 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave -4 121 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 56 121 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 29 136 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 29 136 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 0 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 0 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 0 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 0 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 0 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 0 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 0 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 0 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 0 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 0 0 ; -CC gcaron 2 ; PCC g 0 0 ; PCC caron -30 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute 0 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -30 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -30 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -30 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 0 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 0 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ; -CC scedilla 2 ; PCC s 0 0 ; PCC cedilla 0 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute -10 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -10 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 0 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave -30 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute -20 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis -10 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 10 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Courier.afm b/config/psfonts/Courier.afm deleted file mode 100644 index 3688908c..00000000 --- a/config/psfonts/Courier.afm +++ /dev/null @@ -1,348 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1989, 1990 Adobe Systems Incorporated. All rights reserved. -Comment Creation Date: Thu Jan 18 17:48:17 1990 -Comment UniqueID 27077 -Comment VMusage 27874 40242 -FontName Courier -FullName Courier -FamilyName Courier -Weight Medium -ItalicAngle 0 -IsFixedPitch true -FontBBox -28 -157 628 805 -UnderlinePosition -100 -UnderlineThickness 50 -Version 002.003 -Notice Copyright (c) 1989, 1990 Adobe Systems Incorporated. All rights reserved. -EncodingScheme AdobeStandardEncoding -CapHeight 562 -XHeight 426 -Ascender 629 -Descender -157 -StartCharMetrics 260 -C 32 ; WX 600 ; N space ; B 0 0 0 0 ; -C 33 ; WX 600 ; N exclam ; B 236 -15 364 572 ; -C 34 ; WX 600 ; N quotedbl ; B 187 328 413 562 ; -C 35 ; WX 600 ; N numbersign ; B 100 -32 500 639 ; -C 36 ; WX 600 ; N dollar ; B 112 -126 489 662 ; -C 37 ; WX 600 ; N percent ; B 97 -15 515 622 ; -C 38 ; WX 600 ; N ampersand ; B 70 -15 531 543 ; -C 39 ; WX 600 ; N quoteright ; B 213 328 376 562 ; -C 40 ; WX 600 ; N parenleft ; B 276 -108 433 622 ; -C 41 ; WX 600 ; N parenright ; B 167 -108 324 622 ; -C 42 ; WX 600 ; N asterisk ; B 116 257 484 607 ; -C 43 ; WX 600 ; N plus ; B 87 0 513 426 ; -C 44 ; WX 600 ; N comma ; B 181 -112 344 122 ; -C 45 ; WX 600 ; N hyphen ; B 110 238 490 278 ; -C 46 ; WX 600 ; N period ; B 229 -15 371 109 ; -C 47 ; WX 600 ; N slash ; B 125 -80 475 629 ; -C 48 ; WX 600 ; N zero ; B 113 -15 487 622 ; -C 49 ; WX 600 ; N one ; B 102 0 498 622 ; -C 50 ; WX 600 ; N two ; B 77 0 464 622 ; -C 51 ; WX 600 ; N three ; B 82 -15 459 622 ; -C 52 ; WX 600 ; N four ; B 88 0 493 622 ; -C 53 ; WX 600 ; N five ; B 99 -15 490 607 ; -C 54 ; WX 600 ; N six ; B 118 -15 497 622 ; -C 55 ; WX 600 ; N seven ; B 89 0 476 607 ; -C 56 ; WX 600 ; N eight ; B 109 -15 491 622 ; -C 57 ; WX 600 ; N nine ; B 103 -15 482 622 ; -C 58 ; WX 600 ; N colon ; B 229 -15 371 385 ; -C 59 ; WX 600 ; N semicolon ; B 181 -112 371 385 ; -C 60 ; WX 600 ; N less ; B 41 -2 519 428 ; -C 61 ; WX 600 ; N equal ; B 87 101 513 325 ; -C 62 ; WX 600 ; N greater ; B 81 -2 559 428 ; -C 63 ; WX 600 ; N question ; B 136 -15 485 572 ; -C 64 ; WX 600 ; N at ; B 84 -15 526 622 ; -C 65 ; WX 600 ; N A ; B 10 0 590 562 ; -C 66 ; WX 600 ; N B ; B 50 0 552 562 ; -C 67 ; WX 600 ; N C ; B 48 -18 533 580 ; -C 68 ; WX 600 ; N D ; B 50 0 567 562 ; -C 69 ; WX 600 ; N E ; B 60 0 543 562 ; -C 70 ; WX 600 ; N F ; B 60 0 538 562 ; -C 71 ; WX 600 ; N G ; B 38 -18 568 580 ; -C 72 ; WX 600 ; N H ; B 39 0 561 562 ; -C 73 ; WX 600 ; N I ; B 103 0 497 562 ; -C 74 ; WX 600 ; N J ; B 41 -18 559 562 ; -C 75 ; WX 600 ; N K ; B 45 0 575 562 ; -C 76 ; WX 600 ; N L ; B 54 0 547 562 ; -C 77 ; WX 600 ; N M ; B 11 0 589 562 ; -C 78 ; WX 600 ; N N ; B 14 -13 586 562 ; -C 79 ; WX 600 ; N O ; B 43 -18 557 580 ; -C 80 ; WX 600 ; N P ; B 86 0 551 562 ; -C 81 ; WX 600 ; N Q ; B 43 -129 557 580 ; -C 82 ; WX 600 ; N R ; B 45 0 581 562 ; -C 83 ; WX 600 ; N S ; B 79 -20 522 580 ; -C 84 ; WX 600 ; N T ; B 45 0 556 562 ; -C 85 ; WX 600 ; N U ; B 24 -18 576 562 ; -C 86 ; WX 600 ; N V ; B 3 -13 597 562 ; -C 87 ; WX 600 ; N W ; B 3 -13 597 562 ; -C 88 ; WX 600 ; N X ; B 30 0 570 562 ; -C 89 ; WX 600 ; N Y ; B 31 0 569 562 ; -C 90 ; WX 600 ; N Z ; B 86 0 514 562 ; -C 91 ; WX 600 ; N bracketleft ; B 276 -108 442 622 ; -C 92 ; WX 600 ; N backslash ; B 125 -80 475 629 ; -C 93 ; WX 600 ; N bracketright ; B 158 -108 324 622 ; -C 94 ; WX 600 ; N asciicircum ; B 94 359 506 622 ; -C 95 ; WX 600 ; N underscore ; B 0 -125 600 -75 ; -C 96 ; WX 600 ; N quoteleft ; B 224 328 387 562 ; -C 97 ; WX 600 ; N a ; B 60 -15 552 441 ; -C 98 ; WX 600 ; N b ; B 21 -15 568 629 ; -C 99 ; WX 600 ; N c ; B 73 -15 522 441 ; -C 100 ; WX 600 ; N d ; B 52 -15 584 629 ; -C 101 ; WX 600 ; N e ; B 73 -15 541 441 ; -C 102 ; WX 600 ; N f ; B 121 0 524 629 ; L i fi ; L l fl ; -C 103 ; WX 600 ; N g ; B 52 -157 559 441 ; -C 104 ; WX 600 ; N h ; B 25 0 575 629 ; -C 105 ; WX 600 ; N i ; B 102 0 498 657 ; -C 106 ; WX 600 ; N j ; B 89 -157 403 657 ; -C 107 ; WX 600 ; N k ; B 50 0 573 629 ; -C 108 ; WX 600 ; N l ; B 102 0 498 629 ; -C 109 ; WX 600 ; N m ; B 2 0 598 441 ; -C 110 ; WX 600 ; N n ; B 33 0 568 441 ; -C 111 ; WX 600 ; N o ; B 62 -15 538 441 ; -C 112 ; WX 600 ; N p ; B 16 -157 548 441 ; -C 113 ; WX 600 ; N q ; B 52 -157 584 441 ; -C 114 ; WX 600 ; N r ; B 67 0 552 441 ; -C 115 ; WX 600 ; N s ; B 94 -15 506 441 ; -C 116 ; WX 600 ; N t ; B 74 -15 503 561 ; -C 117 ; WX 600 ; N u ; B 28 -15 555 426 ; -C 118 ; WX 600 ; N v ; B 17 -10 583 426 ; -C 119 ; WX 600 ; N w ; B -1 -10 601 426 ; -C 120 ; WX 600 ; N x ; B 27 0 573 426 ; -C 121 ; WX 600 ; N y ; B -12 -157 552 426 ; -C 122 ; WX 600 ; N z ; B 106 0 495 426 ; -C 123 ; WX 600 ; N braceleft ; B 189 -108 430 622 ; -C 124 ; WX 600 ; N bar ; B 282 -80 319 629 ; -C 125 ; WX 600 ; N braceright ; B 170 -108 411 622 ; -C 126 ; WX 600 ; N asciitilde ; B 67 160 534 269 ; -C 161 ; WX 600 ; N exclamdown ; B 236 -157 364 430 ; -C 162 ; WX 600 ; N cent ; B 103 -49 493 614 ; -C 163 ; WX 600 ; N sterling ; B 91 -21 518 611 ; -C 164 ; WX 600 ; N fraction ; B 31 -57 569 665 ; -C 165 ; WX 600 ; N yen ; B 33 0 567 594 ; -C 166 ; WX 600 ; N florin ; B 11 -143 532 622 ; -C 167 ; WX 600 ; N section ; B 120 -78 481 580 ; -C 168 ; WX 600 ; N currency ; B 80 65 520 499 ; -C 169 ; WX 600 ; N quotesingle ; B 259 328 341 562 ; -C 170 ; WX 600 ; N quotedblleft ; B 143 328 457 562 ; -C 171 ; WX 600 ; N guillemotleft ; B 37 70 563 446 ; -C 172 ; WX 600 ; N guilsinglleft ; B 149 70 451 446 ; -C 173 ; WX 600 ; N guilsinglright ; B 149 70 451 446 ; -C 174 ; WX 600 ; N fi ; B 10 0 590 629 ; -C 175 ; WX 600 ; N fl ; B 10 0 590 629 ; -C 177 ; WX 600 ; N endash ; B 75 238 525 278 ; -C 178 ; WX 600 ; N dagger ; B 148 -78 452 580 ; -C 179 ; WX 600 ; N daggerdbl ; B 148 -78 452 580 ; -C 180 ; WX 600 ; N periodcentered ; B 229 152 371 276 ; -C 182 ; WX 600 ; N paragraph ; B 57 -78 504 562 ; -C 183 ; WX 600 ; N bullet ; B 179 137 421 376 ; -C 184 ; WX 600 ; N quotesinglbase ; B 213 -134 376 100 ; -C 185 ; WX 600 ; N quotedblbase ; B 143 -134 457 100 ; -C 186 ; WX 600 ; N quotedblright ; B 143 328 457 562 ; -C 187 ; WX 600 ; N guillemotright ; B 37 70 563 446 ; -C 188 ; WX 600 ; N ellipsis ; B 44 -15 556 97 ; -C 189 ; WX 600 ; N perthousand ; B 3 -15 600 622 ; -C 191 ; WX 600 ; N questiondown ; B 115 -157 464 430 ; -C 193 ; WX 600 ; N grave ; B 151 497 378 672 ; -C 194 ; WX 600 ; N acute ; B 242 497 469 672 ; -C 195 ; WX 600 ; N circumflex ; B 124 477 476 654 ; -C 196 ; WX 600 ; N tilde ; B 109 503 491 606 ; -C 197 ; WX 600 ; N macron ; B 120 525 480 565 ; -C 198 ; WX 600 ; N breve ; B 153 501 447 609 ; -C 199 ; WX 600 ; N dotaccent ; B 264 508 336 580 ; -C 200 ; WX 600 ; N dieresis ; B 198 508 402 580 ; -C 202 ; WX 600 ; N ring ; B 228 483 372 627 ; -C 203 ; WX 600 ; N cedilla ; B 249 -151 358 10 ; -C 205 ; WX 600 ; N hungarumlaut ; B 133 497 540 672 ; -C 206 ; WX 600 ; N ogonek ; B 227 -151 370 0 ; -C 207 ; WX 600 ; N caron ; B 124 492 476 669 ; -C 208 ; WX 600 ; N emdash ; B 0 238 600 278 ; -C 225 ; WX 600 ; N AE ; B 10 0 543 562 ; -C 227 ; WX 600 ; N ordfeminine ; B 161 259 437 580 ; -C 232 ; WX 600 ; N Lslash ; B 54 0 547 562 ; -C 233 ; WX 600 ; N Oslash ; B 43 -80 557 629 ; -C 234 ; WX 600 ; N OE ; B 14 0 560 562 ; -C 235 ; WX 600 ; N ordmasculine ; B 162 259 438 580 ; -C 241 ; WX 600 ; N ae ; B 26 -15 563 441 ; -C 245 ; WX 600 ; N dotlessi ; B 102 0 498 426 ; -C 248 ; WX 600 ; N lslash ; B 102 0 498 629 ; -C 249 ; WX 600 ; N oslash ; B 62 -80 538 506 ; -C 250 ; WX 600 ; N oe ; B 26 -15 552 441 ; -C 251 ; WX 600 ; N germandbls ; B 55 -15 581 629 ; -C -1 ; WX 600 ; N scedilla ; B 94 -151 506 441 ; -C -1 ; WX 600 ; N notegraphic ; B 136 -15 464 572 ; -C -1 ; WX 600 ; N Ocircumflex ; B 43 -18 557 775 ; -C -1 ; WX 600 ; N ll ; B 25 0 560 629 ; -C -1 ; WX 600 ; N otilde ; B 62 -15 538 606 ; -C -1 ; WX 600 ; N scaron ; B 94 -15 506 669 ; -C -1 ; WX 600 ; N divide ; B 87 1 513 426 ; -C -1 ; WX 600 ; N Thorn ; B 86 0 531 562 ; -C -1 ; WX 600 ; N format ; B 5 -157 42 598 ; -C -1 ; WX 600 ; N largebullet ; B 268 227 332 290 ; -C -1 ; WX 600 ; N Eth ; B 30 0 567 562 ; -C -1 ; WX 600 ; N Odieresis ; B 43 -18 557 716 ; -C -1 ; WX 600 ; N onesuperior ; B 179 249 421 622 ; -C -1 ; WX 600 ; N dectab ; B 18 0 582 227 ; -C -1 ; WX 600 ; N Ydieresis ; B 31 0 569 716 ; -C -1 ; WX 600 ; N merge ; B 167 -15 433 436 ; -C -1 ; WX 600 ; N IJ ; B 39 -18 562 562 ; -C -1 ; WX 600 ; N ccedilla ; B 73 -151 522 441 ; -C -1 ; WX 600 ; N multiply ; B 87 -1 514 426 ; -C -1 ; WX 600 ; N degree ; B 123 269 477 622 ; -C -1 ; WX 600 ; N prescription ; B 34 -15 570 562 ; -C -1 ; WX 600 ; N indent ; B 70 75 530 341 ; -C -1 ; WX 600 ; N Otilde ; B 43 -18 557 732 ; -C -1 ; WX 600 ; N thorn ; B 1 -157 548 629 ; -C -1 ; WX 600 ; N mu ; B 28 -157 555 426 ; -C -1 ; WX 600 ; N Yacute ; B 31 0 569 793 ; -C -1 ; WX 600 ; N threesuperior ; B 162 240 399 622 ; -C -1 ; WX 600 ; N logicalnot ; B 87 64 513 325 ; -C -1 ; WX 600 ; N Ugrave ; B 24 -18 576 793 ; -C -1 ; WX 600 ; N eth ; B 62 -15 538 629 ; -C -1 ; WX 600 ; N left ; B 70 75 530 341 ; -C -1 ; WX 600 ; N Ecircumflex ; B 60 0 543 775 ; -C -1 ; WX 600 ; N edieresis ; B 73 -15 541 580 ; -C -1 ; WX 600 ; N Ograve ; B 43 -18 557 793 ; -C -1 ; WX 600 ; N down ; B 167 -15 433 422 ; -C -1 ; WX 600 ; N Agrave ; B 10 0 590 793 ; -C -1 ; WX 600 ; N atilde ; B 60 -15 552 606 ; -C -1 ; WX 600 ; N up ; B 167 0 433 437 ; -C -1 ; WX 600 ; N eacute ; B 73 -15 541 672 ; -C -1 ; WX 600 ; N graybox ; B 76 0 525 599 ; -C -1 ; WX 600 ; N lira ; B 80 -21 518 611 ; -C -1 ; WX 600 ; N Icircumflex ; B 103 0 497 775 ; -C -1 ; WX 600 ; N Adieresis ; B 10 0 590 716 ; -C -1 ; WX 600 ; N yacute ; B -12 -157 552 672 ; -C -1 ; WX 600 ; N icircumflex ; B 94 0 498 654 ; -C -1 ; WX 600 ; N adieresis ; B 60 -15 552 580 ; -C -1 ; WX 600 ; N zcaron ; B 106 0 495 669 ; -C -1 ; WX 600 ; N Scaron ; B 79 -20 522 805 ; -C -1 ; WX 600 ; N minus ; B 87 195 513 232 ; -C -1 ; WX 600 ; N Aring ; B 10 0 590 753 ; -C -1 ; WX 600 ; N Ucircumflex ; B 24 -18 576 775 ; -C -1 ; WX 600 ; N plusminus ; B 87 0 513 514 ; -C -1 ; WX 600 ; N ograve ; B 62 -15 538 672 ; -C -1 ; WX 600 ; N Edieresis ; B 60 0 543 716 ; -C -1 ; WX 600 ; N brokenbar ; B 282 -80 319 629 ; -C -1 ; WX 600 ; N Idieresis ; B 103 0 497 716 ; -C -1 ; WX 600 ; N acircumflex ; B 60 -15 552 654 ; -C -1 ; WX 600 ; N ydieresis ; B -12 -157 552 580 ; -C -1 ; WX 600 ; N Oacute ; B 43 -18 557 793 ; -C -1 ; WX 600 ; N Egrave ; B 60 0 543 793 ; -C -1 ; WX 600 ; N center ; B 40 14 560 580 ; -C -1 ; WX 600 ; N threequarters ; B 22 -57 574 665 ; -C -1 ; WX 600 ; N tab ; B 19 0 581 562 ; -C -1 ; WX 600 ; N ecircumflex ; B 73 -15 541 654 ; -C -1 ; WX 600 ; N Eacute ; B 60 0 543 793 ; -C -1 ; WX 600 ; N trademark ; B 10 263 591 562 ; -C -1 ; WX 600 ; N square ; B 19 0 581 562 ; -C -1 ; WX 600 ; N onehalf ; B 0 -57 611 665 ; -C -1 ; WX 600 ; N onequarter ; B 6 -57 594 665 ; -C -1 ; WX 600 ; N Uacute ; B 24 -18 576 793 ; -C -1 ; WX 600 ; N Atilde ; B 10 0 590 732 ; -C -1 ; WX 600 ; N copyright ; B 0 -18 600 580 ; -C -1 ; WX 600 ; N Igrave ; B 103 0 497 793 ; -C -1 ; WX 600 ; N Iacute ; B 103 0 497 793 ; -C -1 ; WX 600 ; N Acircumflex ; B 10 0 590 775 ; -C -1 ; WX 600 ; N Udieresis ; B 24 -18 576 716 ; -C -1 ; WX 600 ; N Gcaron ; B 38 -18 568 805 ; -C -1 ; WX 600 ; N Aacute ; B 10 0 590 793 ; -C -1 ; WX 600 ; N LL ; B 15 0 585 562 ; -C -1 ; WX 600 ; N twosuperior ; B 184 249 417 622 ; -C -1 ; WX 600 ; N Scedilla ; B 79 -151 522 580 ; -C -1 ; WX 600 ; N arrowboth ; B -28 122 628 476 ; -C -1 ; WX 600 ; N udieresis ; B 28 -15 555 580 ; -C -1 ; WX 600 ; N odieresis ; B 62 -15 538 580 ; -C -1 ; WX 600 ; N aring ; B 60 -15 552 627 ; -C -1 ; WX 600 ; N ij ; B 44 -157 483 657 ; -C -1 ; WX 600 ; N arrowdown ; B 123 -15 477 608 ; -C -1 ; WX 600 ; N igrave ; B 102 0 498 672 ; -C -1 ; WX 600 ; N aacute ; B 60 -15 552 672 ; -C -1 ; WX 600 ; N stop ; B 19 0 581 562 ; -C -1 ; WX 600 ; N ocircumflex ; B 62 -15 538 654 ; -C -1 ; WX 600 ; N gcaron ; B 52 -157 559 669 ; -C -1 ; WX 600 ; N iacute ; B 102 0 498 672 ; -C -1 ; WX 600 ; N Ntilde ; B 14 -13 586 732 ; -C -1 ; WX 600 ; N idieresis ; B 102 0 498 580 ; -C -1 ; WX 600 ; N Ccedilla ; B 48 -151 533 580 ; -C -1 ; WX 600 ; N arrowright ; B -24 122 624 476 ; -C -1 ; WX 600 ; N ucircumflex ; B 28 -15 555 654 ; -C -1 ; WX 600 ; N Idot ; B 103 0 497 716 ; -C -1 ; WX 600 ; N agrave ; B 60 -15 552 672 ; -C -1 ; WX 600 ; N ntilde ; B 33 0 568 606 ; -C -1 ; WX 600 ; N registered ; B 0 -18 600 580 ; -C -1 ; WX 600 ; N return ; B 19 0 581 562 ; -C -1 ; WX 600 ; N Zcaron ; B 86 0 514 805 ; -C -1 ; WX 600 ; N uacute ; B 28 -15 555 672 ; -C -1 ; WX 600 ; N overscore ; B 0 579 600 629 ; -C -1 ; WX 600 ; N egrave ; B 73 -15 541 672 ; -C -1 ; WX 600 ; N ugrave ; B 28 -15 555 672 ; -C -1 ; WX 600 ; N oacute ; B 62 -15 538 672 ; -C -1 ; WX 600 ; N arrowleft ; B -24 122 624 476 ; -C -1 ; WX 600 ; N arrowup ; B 123 0 477 623 ; -EndCharMetrics -StartComposites 62 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 20 121 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex -30 121 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis -30 136 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave -30 121 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring -15 126 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 0 126 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 0 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 30 121 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 0 121 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 0 136 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 0 121 ; -CC Gcaron 2 ; PCC G 0 0 ; PCC caron 0 136 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 0 121 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 0 121 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 0 136 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 0 121 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 0 126 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 0 121 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 0 121 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 0 136 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 0 121 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 0 126 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 30 136 ; -CC Scedilla 2 ; PCC S 0 0 ; PCC cedilla 0 0 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 30 121 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 0 121 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 0 136 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave -30 121 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 30 121 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 0 136 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 0 136 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 0 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 0 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 0 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 0 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 0 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 0 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 0 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 0 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 0 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 0 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 0 0 ; -CC gcaron 2 ; PCC g 0 0 ; PCC caron -30 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute 0 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -30 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -30 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -30 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 0 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 0 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 0 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 0 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 0 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 0 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 0 0 ; -CC scedilla 2 ; PCC s 0 0 ; PCC cedilla 0 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute -10 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex -10 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 0 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave -30 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute -20 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis -10 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 10 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Helvetica-Bold.afm b/config/psfonts/Helvetica-Bold.afm deleted file mode 100644 index a1e1b33c..00000000 --- a/config/psfonts/Helvetica-Bold.afm +++ /dev/null @@ -1,570 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved. -Comment Creation Date: Thu Mar 15 09:43:00 1990 -Comment UniqueID 28357 -Comment VMusage 26878 33770 -FontName Helvetica-Bold -FullName Helvetica Bold -FamilyName Helvetica -Weight Bold -ItalicAngle 0 -IsFixedPitch false -FontBBox -170 -228 1003 962 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.007 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved.Helvetica is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 718 -XHeight 532 -Ascender 718 -Descender -207 -StartCharMetrics 228 -C 32 ; WX 278 ; N space ; B 0 0 0 0 ; -C 33 ; WX 333 ; N exclam ; B 90 0 244 718 ; -C 34 ; WX 474 ; N quotedbl ; B 98 447 376 718 ; -C 35 ; WX 556 ; N numbersign ; B 18 0 538 698 ; -C 36 ; WX 556 ; N dollar ; B 30 -115 523 775 ; -C 37 ; WX 889 ; N percent ; B 28 -19 861 710 ; -C 38 ; WX 722 ; N ampersand ; B 54 -19 701 718 ; -C 39 ; WX 278 ; N quoteright ; B 69 445 209 718 ; -C 40 ; WX 333 ; N parenleft ; B 35 -208 314 734 ; -C 41 ; WX 333 ; N parenright ; B 19 -208 298 734 ; -C 42 ; WX 389 ; N asterisk ; B 27 387 362 718 ; -C 43 ; WX 584 ; N plus ; B 40 0 544 506 ; -C 44 ; WX 278 ; N comma ; B 64 -168 214 146 ; -C 45 ; WX 333 ; N hyphen ; B 27 215 306 345 ; -C 46 ; WX 278 ; N period ; B 64 0 214 146 ; -C 47 ; WX 278 ; N slash ; B -33 -19 311 737 ; -C 48 ; WX 556 ; N zero ; B 32 -19 524 710 ; -C 49 ; WX 556 ; N one ; B 69 0 378 710 ; -C 50 ; WX 556 ; N two ; B 26 0 511 710 ; -C 51 ; WX 556 ; N three ; B 27 -19 516 710 ; -C 52 ; WX 556 ; N four ; B 27 0 526 710 ; -C 53 ; WX 556 ; N five ; B 27 -19 516 698 ; -C 54 ; WX 556 ; N six ; B 31 -19 520 710 ; -C 55 ; WX 556 ; N seven ; B 25 0 528 698 ; -C 56 ; WX 556 ; N eight ; B 32 -19 524 710 ; -C 57 ; WX 556 ; N nine ; B 30 -19 522 710 ; -C 58 ; WX 333 ; N colon ; B 92 0 242 512 ; -C 59 ; WX 333 ; N semicolon ; B 92 -168 242 512 ; -C 60 ; WX 584 ; N less ; B 38 -8 546 514 ; -C 61 ; WX 584 ; N equal ; B 40 87 544 419 ; -C 62 ; WX 584 ; N greater ; B 38 -8 546 514 ; -C 63 ; WX 611 ; N question ; B 60 0 556 727 ; -C 64 ; WX 975 ; N at ; B 118 -19 856 737 ; -C 65 ; WX 722 ; N A ; B 20 0 702 718 ; -C 66 ; WX 722 ; N B ; B 76 0 669 718 ; -C 67 ; WX 722 ; N C ; B 44 -19 684 737 ; -C 68 ; WX 722 ; N D ; B 76 0 685 718 ; -C 69 ; WX 667 ; N E ; B 76 0 621 718 ; -C 70 ; WX 611 ; N F ; B 76 0 587 718 ; -C 71 ; WX 778 ; N G ; B 44 -19 713 737 ; -C 72 ; WX 722 ; N H ; B 71 0 651 718 ; -C 73 ; WX 278 ; N I ; B 64 0 214 718 ; -C 74 ; WX 556 ; N J ; B 22 -18 484 718 ; -C 75 ; WX 722 ; N K ; B 87 0 722 718 ; -C 76 ; WX 611 ; N L ; B 76 0 583 718 ; -C 77 ; WX 833 ; N M ; B 69 0 765 718 ; -C 78 ; WX 722 ; N N ; B 69 0 654 718 ; -C 79 ; WX 778 ; N O ; B 44 -19 734 737 ; -C 80 ; WX 667 ; N P ; B 76 0 627 718 ; -C 81 ; WX 778 ; N Q ; B 44 -52 737 737 ; -C 82 ; WX 722 ; N R ; B 76 0 677 718 ; -C 83 ; WX 667 ; N S ; B 39 -19 629 737 ; -C 84 ; WX 611 ; N T ; B 14 0 598 718 ; -C 85 ; WX 722 ; N U ; B 72 -19 651 718 ; -C 86 ; WX 667 ; N V ; B 19 0 648 718 ; -C 87 ; WX 944 ; N W ; B 16 0 929 718 ; -C 88 ; WX 667 ; N X ; B 14 0 653 718 ; -C 89 ; WX 667 ; N Y ; B 15 0 653 718 ; -C 90 ; WX 611 ; N Z ; B 25 0 586 718 ; -C 91 ; WX 333 ; N bracketleft ; B 63 -196 309 722 ; -C 92 ; WX 278 ; N backslash ; B -33 -19 311 737 ; -C 93 ; WX 333 ; N bracketright ; B 24 -196 270 722 ; -C 94 ; WX 584 ; N asciicircum ; B 62 323 522 698 ; -C 95 ; WX 556 ; N underscore ; B 0 -125 556 -75 ; -C 96 ; WX 278 ; N quoteleft ; B 69 454 209 727 ; -C 97 ; WX 556 ; N a ; B 29 -14 527 546 ; -C 98 ; WX 611 ; N b ; B 61 -14 578 718 ; -C 99 ; WX 556 ; N c ; B 34 -14 524 546 ; -C 100 ; WX 611 ; N d ; B 34 -14 551 718 ; -C 101 ; WX 556 ; N e ; B 23 -14 528 546 ; -C 102 ; WX 333 ; N f ; B 10 0 318 727 ; L i fi ; L l fl ; -C 103 ; WX 611 ; N g ; B 40 -217 553 546 ; -C 104 ; WX 611 ; N h ; B 65 0 546 718 ; -C 105 ; WX 278 ; N i ; B 69 0 209 725 ; -C 106 ; WX 278 ; N j ; B 3 -214 209 725 ; -C 107 ; WX 556 ; N k ; B 69 0 562 718 ; -C 108 ; WX 278 ; N l ; B 69 0 209 718 ; -C 109 ; WX 889 ; N m ; B 64 0 826 546 ; -C 110 ; WX 611 ; N n ; B 65 0 546 546 ; -C 111 ; WX 611 ; N o ; B 34 -14 578 546 ; -C 112 ; WX 611 ; N p ; B 62 -207 578 546 ; -C 113 ; WX 611 ; N q ; B 34 -207 552 546 ; -C 114 ; WX 389 ; N r ; B 64 0 373 546 ; -C 115 ; WX 556 ; N s ; B 30 -14 519 546 ; -C 116 ; WX 333 ; N t ; B 10 -6 309 676 ; -C 117 ; WX 611 ; N u ; B 66 -14 545 532 ; -C 118 ; WX 556 ; N v ; B 13 0 543 532 ; -C 119 ; WX 778 ; N w ; B 10 0 769 532 ; -C 120 ; WX 556 ; N x ; B 15 0 541 532 ; -C 121 ; WX 556 ; N y ; B 10 -214 539 532 ; -C 122 ; WX 500 ; N z ; B 20 0 480 532 ; -C 123 ; WX 389 ; N braceleft ; B 48 -196 365 722 ; -C 124 ; WX 280 ; N bar ; B 84 -19 196 737 ; -C 125 ; WX 389 ; N braceright ; B 24 -196 341 722 ; -C 126 ; WX 584 ; N asciitilde ; B 61 163 523 343 ; -C 161 ; WX 333 ; N exclamdown ; B 90 -186 244 532 ; -C 162 ; WX 556 ; N cent ; B 34 -118 524 628 ; -C 163 ; WX 556 ; N sterling ; B 28 -16 541 718 ; -C 164 ; WX 167 ; N fraction ; B -170 -19 336 710 ; -C 165 ; WX 556 ; N yen ; B -9 0 565 698 ; -C 166 ; WX 556 ; N florin ; B -10 -210 516 737 ; -C 167 ; WX 556 ; N section ; B 34 -184 522 727 ; -C 168 ; WX 556 ; N currency ; B -3 76 559 636 ; -C 169 ; WX 238 ; N quotesingle ; B 70 447 168 718 ; -C 170 ; WX 500 ; N quotedblleft ; B 64 454 436 727 ; -C 171 ; WX 556 ; N guillemotleft ; B 88 76 468 484 ; -C 172 ; WX 333 ; N guilsinglleft ; B 83 76 250 484 ; -C 173 ; WX 333 ; N guilsinglright ; B 83 76 250 484 ; -C 174 ; WX 611 ; N fi ; B 10 0 542 727 ; -C 175 ; WX 611 ; N fl ; B 10 0 542 727 ; -C 177 ; WX 556 ; N endash ; B 0 227 556 333 ; -C 178 ; WX 556 ; N dagger ; B 36 -171 520 718 ; -C 179 ; WX 556 ; N daggerdbl ; B 36 -171 520 718 ; -C 180 ; WX 278 ; N periodcentered ; B 58 172 220 334 ; -C 182 ; WX 556 ; N paragraph ; B -8 -191 539 700 ; -C 183 ; WX 350 ; N bullet ; B 10 194 340 524 ; -C 184 ; WX 278 ; N quotesinglbase ; B 69 -146 209 127 ; -C 185 ; WX 500 ; N quotedblbase ; B 64 -146 436 127 ; -C 186 ; WX 500 ; N quotedblright ; B 64 445 436 718 ; -C 187 ; WX 556 ; N guillemotright ; B 88 76 468 484 ; -C 188 ; WX 1000 ; N ellipsis ; B 92 0 908 146 ; -C 189 ; WX 1000 ; N perthousand ; B -3 -19 1003 710 ; -C 191 ; WX 611 ; N questiondown ; B 55 -195 551 532 ; -C 193 ; WX 333 ; N grave ; B -23 604 225 750 ; -C 194 ; WX 333 ; N acute ; B 108 604 356 750 ; -C 195 ; WX 333 ; N circumflex ; B -10 604 343 750 ; -C 196 ; WX 333 ; N tilde ; B -17 610 350 737 ; -C 197 ; WX 333 ; N macron ; B -6 604 339 678 ; -C 198 ; WX 333 ; N breve ; B -2 604 335 750 ; -C 199 ; WX 333 ; N dotaccent ; B 104 614 230 729 ; -C 200 ; WX 333 ; N dieresis ; B 6 614 327 729 ; -C 202 ; WX 333 ; N ring ; B 59 568 275 776 ; -C 203 ; WX 333 ; N cedilla ; B 6 -228 245 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B 9 604 486 750 ; -C 206 ; WX 333 ; N ogonek ; B 71 -228 304 0 ; -C 207 ; WX 333 ; N caron ; B -10 604 343 750 ; -C 208 ; WX 1000 ; N emdash ; B 0 227 1000 333 ; -C 225 ; WX 1000 ; N AE ; B 5 0 954 718 ; -C 227 ; WX 370 ; N ordfeminine ; B 22 276 347 737 ; -C 232 ; WX 611 ; N Lslash ; B -20 0 583 718 ; -C 233 ; WX 778 ; N Oslash ; B 33 -27 744 745 ; -C 234 ; WX 1000 ; N OE ; B 37 -19 961 737 ; -C 235 ; WX 365 ; N ordmasculine ; B 6 276 360 737 ; -C 241 ; WX 889 ; N ae ; B 29 -14 858 546 ; -C 245 ; WX 278 ; N dotlessi ; B 69 0 209 532 ; -C 248 ; WX 278 ; N lslash ; B -18 0 296 718 ; -C 249 ; WX 611 ; N oslash ; B 22 -29 589 560 ; -C 250 ; WX 944 ; N oe ; B 34 -14 912 546 ; -C 251 ; WX 611 ; N germandbls ; B 69 -14 579 731 ; -C -1 ; WX 611 ; N Zcaron ; B 25 0 586 936 ; -C -1 ; WX 556 ; N ccedilla ; B 34 -228 524 546 ; -C -1 ; WX 556 ; N ydieresis ; B 10 -214 539 729 ; -C -1 ; WX 556 ; N atilde ; B 29 -14 527 737 ; -C -1 ; WX 278 ; N icircumflex ; B -37 0 316 750 ; -C -1 ; WX 333 ; N threesuperior ; B 8 271 326 710 ; -C -1 ; WX 556 ; N ecircumflex ; B 23 -14 528 750 ; -C -1 ; WX 611 ; N thorn ; B 62 -208 578 718 ; -C -1 ; WX 556 ; N egrave ; B 23 -14 528 750 ; -C -1 ; WX 333 ; N twosuperior ; B 9 283 324 710 ; -C -1 ; WX 556 ; N eacute ; B 23 -14 528 750 ; -C -1 ; WX 611 ; N otilde ; B 34 -14 578 737 ; -C -1 ; WX 722 ; N Aacute ; B 20 0 702 936 ; -C -1 ; WX 611 ; N ocircumflex ; B 34 -14 578 750 ; -C -1 ; WX 556 ; N yacute ; B 10 -214 539 750 ; -C -1 ; WX 611 ; N udieresis ; B 66 -14 545 729 ; -C -1 ; WX 834 ; N threequarters ; B 16 -19 799 710 ; -C -1 ; WX 556 ; N acircumflex ; B 29 -14 527 750 ; -C -1 ; WX 722 ; N Eth ; B -5 0 685 718 ; -C -1 ; WX 556 ; N edieresis ; B 23 -14 528 729 ; -C -1 ; WX 611 ; N ugrave ; B 66 -14 545 750 ; -C -1 ; WX 1000 ; N trademark ; B 44 306 956 718 ; -C -1 ; WX 611 ; N ograve ; B 34 -14 578 750 ; -C -1 ; WX 556 ; N scaron ; B 30 -14 519 750 ; -C -1 ; WX 278 ; N Idieresis ; B -21 0 300 915 ; -C -1 ; WX 611 ; N uacute ; B 66 -14 545 750 ; -C -1 ; WX 556 ; N agrave ; B 29 -14 527 750 ; -C -1 ; WX 611 ; N ntilde ; B 65 0 546 737 ; -C -1 ; WX 556 ; N aring ; B 29 -14 527 776 ; -C -1 ; WX 500 ; N zcaron ; B 20 0 480 750 ; -C -1 ; WX 278 ; N Icircumflex ; B -37 0 316 936 ; -C -1 ; WX 722 ; N Ntilde ; B 69 0 654 923 ; -C -1 ; WX 611 ; N ucircumflex ; B 66 -14 545 750 ; -C -1 ; WX 667 ; N Ecircumflex ; B 76 0 621 936 ; -C -1 ; WX 278 ; N Iacute ; B 64 0 329 936 ; -C -1 ; WX 722 ; N Ccedilla ; B 44 -228 684 737 ; -C -1 ; WX 778 ; N Odieresis ; B 44 -19 734 915 ; -C -1 ; WX 667 ; N Scaron ; B 39 -19 629 936 ; -C -1 ; WX 667 ; N Edieresis ; B 76 0 621 915 ; -C -1 ; WX 278 ; N Igrave ; B -50 0 214 936 ; -C -1 ; WX 556 ; N adieresis ; B 29 -14 527 729 ; -C -1 ; WX 778 ; N Ograve ; B 44 -19 734 936 ; -C -1 ; WX 667 ; N Egrave ; B 76 0 621 936 ; -C -1 ; WX 667 ; N Ydieresis ; B 15 0 653 915 ; -C -1 ; WX 737 ; N registered ; B -11 -19 748 737 ; -C -1 ; WX 778 ; N Otilde ; B 44 -19 734 923 ; -C -1 ; WX 834 ; N onequarter ; B 26 -19 766 710 ; -C -1 ; WX 722 ; N Ugrave ; B 72 -19 651 936 ; -C -1 ; WX 722 ; N Ucircumflex ; B 72 -19 651 936 ; -C -1 ; WX 667 ; N Thorn ; B 76 0 627 718 ; -C -1 ; WX 584 ; N divide ; B 40 -42 544 548 ; -C -1 ; WX 722 ; N Atilde ; B 20 0 702 923 ; -C -1 ; WX 722 ; N Uacute ; B 72 -19 651 936 ; -C -1 ; WX 778 ; N Ocircumflex ; B 44 -19 734 936 ; -C -1 ; WX 584 ; N logicalnot ; B 40 108 544 419 ; -C -1 ; WX 722 ; N Aring ; B 20 0 702 962 ; -C -1 ; WX 278 ; N idieresis ; B -21 0 300 729 ; -C -1 ; WX 278 ; N iacute ; B 69 0 329 750 ; -C -1 ; WX 556 ; N aacute ; B 29 -14 527 750 ; -C -1 ; WX 584 ; N plusminus ; B 40 0 544 506 ; -C -1 ; WX 584 ; N multiply ; B 40 1 545 505 ; -C -1 ; WX 722 ; N Udieresis ; B 72 -19 651 915 ; -C -1 ; WX 584 ; N minus ; B 40 197 544 309 ; -C -1 ; WX 333 ; N onesuperior ; B 26 283 237 710 ; -C -1 ; WX 667 ; N Eacute ; B 76 0 621 936 ; -C -1 ; WX 722 ; N Acircumflex ; B 20 0 702 936 ; -C -1 ; WX 737 ; N copyright ; B -11 -19 749 737 ; -C -1 ; WX 722 ; N Agrave ; B 20 0 702 936 ; -C -1 ; WX 611 ; N odieresis ; B 34 -14 578 729 ; -C -1 ; WX 611 ; N oacute ; B 34 -14 578 750 ; -C -1 ; WX 400 ; N degree ; B 57 426 343 712 ; -C -1 ; WX 278 ; N igrave ; B -50 0 209 750 ; -C -1 ; WX 611 ; N mu ; B 66 -207 545 532 ; -C -1 ; WX 778 ; N Oacute ; B 44 -19 734 936 ; -C -1 ; WX 611 ; N eth ; B 34 -14 578 737 ; -C -1 ; WX 722 ; N Adieresis ; B 20 0 702 915 ; -C -1 ; WX 667 ; N Yacute ; B 15 0 653 936 ; -C -1 ; WX 280 ; N brokenbar ; B 84 -19 196 737 ; -C -1 ; WX 834 ; N onehalf ; B 26 -19 794 710 ; -EndCharMetrics -StartKernData -StartKernPairs 209 - -KPX A y -30 -KPX A w -30 -KPX A v -40 -KPX A u -30 -KPX A Y -110 -KPX A W -60 -KPX A V -80 -KPX A U -50 -KPX A T -90 -KPX A Q -40 -KPX A O -40 -KPX A G -50 -KPX A C -40 - -KPX B U -10 -KPX B A -30 - -KPX D period -30 -KPX D comma -30 -KPX D Y -70 -KPX D W -40 -KPX D V -40 -KPX D A -40 - -KPX F period -100 -KPX F comma -100 -KPX F a -20 -KPX F A -80 - -KPX J u -20 -KPX J period -20 -KPX J comma -20 -KPX J A -20 - -KPX K y -40 -KPX K u -30 -KPX K o -35 -KPX K e -15 -KPX K O -30 - -KPX L y -30 -KPX L quoteright -140 -KPX L quotedblright -140 -KPX L Y -120 -KPX L W -80 -KPX L V -110 -KPX L T -90 - -KPX O period -40 -KPX O comma -40 -KPX O Y -70 -KPX O X -50 -KPX O W -50 -KPX O V -50 -KPX O T -40 -KPX O A -50 - -KPX P period -120 -KPX P o -40 -KPX P e -30 -KPX P comma -120 -KPX P a -30 -KPX P A -100 - -KPX Q period 20 -KPX Q comma 20 -KPX Q U -10 - -KPX R Y -50 -KPX R W -40 -KPX R V -50 -KPX R U -20 -KPX R T -20 -KPX R O -20 - -KPX T y -60 -KPX T w -60 -KPX T u -90 -KPX T semicolon -40 -KPX T r -80 -KPX T period -80 -KPX T o -80 -KPX T hyphen -120 -KPX T e -60 -KPX T comma -80 -KPX T colon -40 -KPX T a -80 -KPX T O -40 -KPX T A -90 - -KPX U period -30 -KPX U comma -30 -KPX U A -50 - -KPX V u -60 -KPX V semicolon -40 -KPX V period -120 -KPX V o -90 -KPX V hyphen -80 -KPX V e -50 -KPX V comma -120 -KPX V colon -40 -KPX V a -60 -KPX V O -50 -KPX V G -50 -KPX V A -80 - -KPX W y -20 -KPX W u -45 -KPX W semicolon -10 -KPX W period -80 -KPX W o -60 -KPX W hyphen -40 -KPX W e -35 -KPX W comma -80 -KPX W colon -10 -KPX W a -40 -KPX W O -20 -KPX W A -60 - -KPX Y u -100 -KPX Y semicolon -50 -KPX Y period -100 -KPX Y o -100 -KPX Y e -80 -KPX Y comma -100 -KPX Y colon -50 -KPX Y a -90 -KPX Y O -70 -KPX Y A -110 - -KPX a y -20 -KPX a w -15 -KPX a v -15 -KPX a g -10 - -KPX b y -20 -KPX b v -20 -KPX b u -20 -KPX b l -10 - -KPX c y -10 -KPX c l -20 -KPX c k -20 -KPX c h -10 - -KPX colon space -40 - -KPX comma space -40 -KPX comma quoteright -120 -KPX comma quotedblright -120 - -KPX d y -15 -KPX d w -15 -KPX d v -15 -KPX d d -10 - -KPX e y -15 -KPX e x -15 -KPX e w -15 -KPX e v -15 -KPX e period 20 -KPX e comma 10 - -KPX f quoteright 30 -KPX f quotedblright 30 -KPX f period -10 -KPX f o -20 -KPX f e -10 -KPX f comma -10 - -KPX g g -10 -KPX g e 10 - -KPX h y -20 - -KPX k o -15 - -KPX l y -15 -KPX l w -15 - -KPX m y -30 -KPX m u -20 - -KPX n y -20 -KPX n v -40 -KPX n u -10 - -KPX o y -20 -KPX o x -30 -KPX o w -15 -KPX o v -20 - -KPX p y -15 - -KPX period space -40 -KPX period quoteright -120 -KPX period quotedblright -120 - -KPX quotedblright space -80 - -KPX quoteleft quoteleft -46 - -KPX quoteright v -20 -KPX quoteright space -80 -KPX quoteright s -60 -KPX quoteright r -40 -KPX quoteright quoteright -46 -KPX quoteright l -20 -KPX quoteright d -80 - -KPX r y 10 -KPX r v 10 -KPX r t 20 -KPX r s -15 -KPX r q -20 -KPX r period -60 -KPX r o -20 -KPX r hyphen -20 -KPX r g -15 -KPX r d -20 -KPX r comma -60 -KPX r c -20 - -KPX s w -15 - -KPX semicolon space -40 - -KPX space quoteleft -60 -KPX space quotedblleft -80 -KPX space Y -120 -KPX space W -80 -KPX space V -80 -KPX space T -100 - -KPX v period -80 -KPX v o -30 -KPX v comma -80 -KPX v a -20 - -KPX w period -40 -KPX w o -20 -KPX w comma -40 - -KPX x e -10 - -KPX y period -80 -KPX y o -25 -KPX y e -10 -KPX y comma -80 -KPX y a -30 - -KPX z e 10 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 195 186 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 195 186 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 195 186 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 195 186 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 195 186 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 195 186 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 215 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 167 186 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 167 186 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 167 186 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 167 186 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute -27 186 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex -27 186 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis -27 186 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave -27 186 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 195 186 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 223 186 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 223 186 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 223 186 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 223 186 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 223 186 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 186 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 195 186 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 195 186 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 195 186 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 195 186 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 167 186 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 167 186 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 186 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 112 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 112 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 112 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 112 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 112 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 112 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 132 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 112 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 112 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 112 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 112 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 139 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 139 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 139 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 139 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 139 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 112 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 139 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 139 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 139 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 139 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 112 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 112 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 84 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Helvetica-BoldOblique.afm b/config/psfonts/Helvetica-BoldOblique.afm deleted file mode 100644 index b6cff415..00000000 --- a/config/psfonts/Helvetica-BoldOblique.afm +++ /dev/null @@ -1,570 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved. -Comment Creation Date: Thu Mar 15 10:44:33 1990 -Comment UniqueID 28371 -Comment VMusage 7614 43068 -FontName Helvetica-BoldOblique -FullName Helvetica Bold Oblique -FamilyName Helvetica -Weight Bold -ItalicAngle -12 -IsFixedPitch false -FontBBox -174 -228 1114 962 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.007 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved.Helvetica is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 718 -XHeight 532 -Ascender 718 -Descender -207 -StartCharMetrics 228 -C 32 ; WX 278 ; N space ; B 0 0 0 0 ; -C 33 ; WX 333 ; N exclam ; B 94 0 397 718 ; -C 34 ; WX 474 ; N quotedbl ; B 193 447 529 718 ; -C 35 ; WX 556 ; N numbersign ; B 60 0 644 698 ; -C 36 ; WX 556 ; N dollar ; B 67 -115 622 775 ; -C 37 ; WX 889 ; N percent ; B 136 -19 901 710 ; -C 38 ; WX 722 ; N ampersand ; B 89 -19 732 718 ; -C 39 ; WX 278 ; N quoteright ; B 167 445 362 718 ; -C 40 ; WX 333 ; N parenleft ; B 76 -208 470 734 ; -C 41 ; WX 333 ; N parenright ; B -25 -208 369 734 ; -C 42 ; WX 389 ; N asterisk ; B 146 387 481 718 ; -C 43 ; WX 584 ; N plus ; B 82 0 610 506 ; -C 44 ; WX 278 ; N comma ; B 28 -168 245 146 ; -C 45 ; WX 333 ; N hyphen ; B 73 215 379 345 ; -C 46 ; WX 278 ; N period ; B 64 0 245 146 ; -C 47 ; WX 278 ; N slash ; B -37 -19 468 737 ; -C 48 ; WX 556 ; N zero ; B 86 -19 617 710 ; -C 49 ; WX 556 ; N one ; B 173 0 529 710 ; -C 50 ; WX 556 ; N two ; B 26 0 619 710 ; -C 51 ; WX 556 ; N three ; B 65 -19 608 710 ; -C 52 ; WX 556 ; N four ; B 60 0 598 710 ; -C 53 ; WX 556 ; N five ; B 64 -19 636 698 ; -C 54 ; WX 556 ; N six ; B 85 -19 619 710 ; -C 55 ; WX 556 ; N seven ; B 125 0 676 698 ; -C 56 ; WX 556 ; N eight ; B 69 -19 616 710 ; -C 57 ; WX 556 ; N nine ; B 78 -19 615 710 ; -C 58 ; WX 333 ; N colon ; B 92 0 351 512 ; -C 59 ; WX 333 ; N semicolon ; B 56 -168 351 512 ; -C 60 ; WX 584 ; N less ; B 82 -8 655 514 ; -C 61 ; WX 584 ; N equal ; B 58 87 633 419 ; -C 62 ; WX 584 ; N greater ; B 36 -8 609 514 ; -C 63 ; WX 611 ; N question ; B 165 0 671 727 ; -C 64 ; WX 975 ; N at ; B 186 -19 954 737 ; -C 65 ; WX 722 ; N A ; B 20 0 702 718 ; -C 66 ; WX 722 ; N B ; B 76 0 764 718 ; -C 67 ; WX 722 ; N C ; B 107 -19 789 737 ; -C 68 ; WX 722 ; N D ; B 76 0 777 718 ; -C 69 ; WX 667 ; N E ; B 76 0 757 718 ; -C 70 ; WX 611 ; N F ; B 76 0 740 718 ; -C 71 ; WX 778 ; N G ; B 108 -19 817 737 ; -C 72 ; WX 722 ; N H ; B 71 0 804 718 ; -C 73 ; WX 278 ; N I ; B 64 0 367 718 ; -C 74 ; WX 556 ; N J ; B 60 -18 637 718 ; -C 75 ; WX 722 ; N K ; B 87 0 858 718 ; -C 76 ; WX 611 ; N L ; B 76 0 611 718 ; -C 77 ; WX 833 ; N M ; B 69 0 918 718 ; -C 78 ; WX 722 ; N N ; B 69 0 807 718 ; -C 79 ; WX 778 ; N O ; B 107 -19 823 737 ; -C 80 ; WX 667 ; N P ; B 76 0 738 718 ; -C 81 ; WX 778 ; N Q ; B 107 -52 823 737 ; -C 82 ; WX 722 ; N R ; B 76 0 778 718 ; -C 83 ; WX 667 ; N S ; B 81 -19 718 737 ; -C 84 ; WX 611 ; N T ; B 140 0 751 718 ; -C 85 ; WX 722 ; N U ; B 116 -19 804 718 ; -C 86 ; WX 667 ; N V ; B 172 0 801 718 ; -C 87 ; WX 944 ; N W ; B 169 0 1082 718 ; -C 88 ; WX 667 ; N X ; B 14 0 791 718 ; -C 89 ; WX 667 ; N Y ; B 168 0 806 718 ; -C 90 ; WX 611 ; N Z ; B 25 0 737 718 ; -C 91 ; WX 333 ; N bracketleft ; B 21 -196 462 722 ; -C 92 ; WX 278 ; N backslash ; B 124 -19 307 737 ; -C 93 ; WX 333 ; N bracketright ; B -18 -196 423 722 ; -C 94 ; WX 584 ; N asciicircum ; B 131 323 591 698 ; -C 95 ; WX 556 ; N underscore ; B -27 -125 540 -75 ; -C 96 ; WX 278 ; N quoteleft ; B 165 454 361 727 ; -C 97 ; WX 556 ; N a ; B 55 -14 583 546 ; -C 98 ; WX 611 ; N b ; B 61 -14 645 718 ; -C 99 ; WX 556 ; N c ; B 79 -14 599 546 ; -C 100 ; WX 611 ; N d ; B 82 -14 704 718 ; -C 101 ; WX 556 ; N e ; B 70 -14 593 546 ; -C 102 ; WX 333 ; N f ; B 87 0 469 727 ; L i fi ; L l fl ; -C 103 ; WX 611 ; N g ; B 38 -217 666 546 ; -C 104 ; WX 611 ; N h ; B 65 0 629 718 ; -C 105 ; WX 278 ; N i ; B 69 0 363 725 ; -C 106 ; WX 278 ; N j ; B -42 -214 363 725 ; -C 107 ; WX 556 ; N k ; B 69 0 670 718 ; -C 108 ; WX 278 ; N l ; B 69 0 362 718 ; -C 109 ; WX 889 ; N m ; B 64 0 909 546 ; -C 110 ; WX 611 ; N n ; B 65 0 629 546 ; -C 111 ; WX 611 ; N o ; B 82 -14 643 546 ; -C 112 ; WX 611 ; N p ; B 18 -207 645 546 ; -C 113 ; WX 611 ; N q ; B 80 -207 665 546 ; -C 114 ; WX 389 ; N r ; B 64 0 489 546 ; -C 115 ; WX 556 ; N s ; B 63 -14 584 546 ; -C 116 ; WX 333 ; N t ; B 100 -6 422 676 ; -C 117 ; WX 611 ; N u ; B 98 -14 658 532 ; -C 118 ; WX 556 ; N v ; B 126 0 656 532 ; -C 119 ; WX 778 ; N w ; B 123 0 882 532 ; -C 120 ; WX 556 ; N x ; B 15 0 648 532 ; -C 121 ; WX 556 ; N y ; B 42 -214 652 532 ; -C 122 ; WX 500 ; N z ; B 20 0 583 532 ; -C 123 ; WX 389 ; N braceleft ; B 94 -196 518 722 ; -C 124 ; WX 280 ; N bar ; B 80 -19 353 737 ; -C 125 ; WX 389 ; N braceright ; B -18 -196 407 722 ; -C 126 ; WX 584 ; N asciitilde ; B 115 163 577 343 ; -C 161 ; WX 333 ; N exclamdown ; B 50 -186 353 532 ; -C 162 ; WX 556 ; N cent ; B 79 -118 599 628 ; -C 163 ; WX 556 ; N sterling ; B 50 -16 635 718 ; -C 164 ; WX 167 ; N fraction ; B -174 -19 487 710 ; -C 165 ; WX 556 ; N yen ; B 60 0 713 698 ; -C 166 ; WX 556 ; N florin ; B -50 -210 669 737 ; -C 167 ; WX 556 ; N section ; B 61 -184 598 727 ; -C 168 ; WX 556 ; N currency ; B 27 76 680 636 ; -C 169 ; WX 238 ; N quotesingle ; B 165 447 321 718 ; -C 170 ; WX 500 ; N quotedblleft ; B 160 454 588 727 ; -C 171 ; WX 556 ; N guillemotleft ; B 135 76 571 484 ; -C 172 ; WX 333 ; N guilsinglleft ; B 130 76 353 484 ; -C 173 ; WX 333 ; N guilsinglright ; B 99 76 322 484 ; -C 174 ; WX 611 ; N fi ; B 87 0 696 727 ; -C 175 ; WX 611 ; N fl ; B 87 0 695 727 ; -C 177 ; WX 556 ; N endash ; B 48 227 627 333 ; -C 178 ; WX 556 ; N dagger ; B 118 -171 626 718 ; -C 179 ; WX 556 ; N daggerdbl ; B 46 -171 628 718 ; -C 180 ; WX 278 ; N periodcentered ; B 110 172 276 334 ; -C 182 ; WX 556 ; N paragraph ; B 98 -191 688 700 ; -C 183 ; WX 350 ; N bullet ; B 83 194 420 524 ; -C 184 ; WX 278 ; N quotesinglbase ; B 41 -146 236 127 ; -C 185 ; WX 500 ; N quotedblbase ; B 36 -146 463 127 ; -C 186 ; WX 500 ; N quotedblright ; B 162 445 589 718 ; -C 187 ; WX 556 ; N guillemotright ; B 104 76 540 484 ; -C 188 ; WX 1000 ; N ellipsis ; B 92 0 939 146 ; -C 189 ; WX 1000 ; N perthousand ; B 76 -19 1038 710 ; -C 191 ; WX 611 ; N questiondown ; B 53 -195 559 532 ; -C 193 ; WX 333 ; N grave ; B 136 604 353 750 ; -C 194 ; WX 333 ; N acute ; B 236 604 515 750 ; -C 195 ; WX 333 ; N circumflex ; B 118 604 471 750 ; -C 196 ; WX 333 ; N tilde ; B 113 610 507 737 ; -C 197 ; WX 333 ; N macron ; B 122 604 483 678 ; -C 198 ; WX 333 ; N breve ; B 156 604 494 750 ; -C 199 ; WX 333 ; N dotaccent ; B 235 614 385 729 ; -C 200 ; WX 333 ; N dieresis ; B 137 614 482 729 ; -C 202 ; WX 333 ; N ring ; B 200 568 420 776 ; -C 203 ; WX 333 ; N cedilla ; B -37 -228 220 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B 137 604 645 750 ; -C 206 ; WX 333 ; N ogonek ; B 41 -228 264 0 ; -C 207 ; WX 333 ; N caron ; B 149 604 502 750 ; -C 208 ; WX 1000 ; N emdash ; B 48 227 1071 333 ; -C 225 ; WX 1000 ; N AE ; B 5 0 1100 718 ; -C 227 ; WX 370 ; N ordfeminine ; B 92 276 465 737 ; -C 232 ; WX 611 ; N Lslash ; B 34 0 611 718 ; -C 233 ; WX 778 ; N Oslash ; B 35 -27 894 745 ; -C 234 ; WX 1000 ; N OE ; B 99 -19 1114 737 ; -C 235 ; WX 365 ; N ordmasculine ; B 92 276 485 737 ; -C 241 ; WX 889 ; N ae ; B 56 -14 923 546 ; -C 245 ; WX 278 ; N dotlessi ; B 69 0 322 532 ; -C 248 ; WX 278 ; N lslash ; B 40 0 407 718 ; -C 249 ; WX 611 ; N oslash ; B 22 -29 701 560 ; -C 250 ; WX 944 ; N oe ; B 82 -14 977 546 ; -C 251 ; WX 611 ; N germandbls ; B 69 -14 657 731 ; -C -1 ; WX 611 ; N Zcaron ; B 25 0 737 936 ; -C -1 ; WX 556 ; N ccedilla ; B 79 -228 599 546 ; -C -1 ; WX 556 ; N ydieresis ; B 42 -214 652 729 ; -C -1 ; WX 556 ; N atilde ; B 55 -14 619 737 ; -C -1 ; WX 278 ; N icircumflex ; B 69 0 444 750 ; -C -1 ; WX 333 ; N threesuperior ; B 91 271 441 710 ; -C -1 ; WX 556 ; N ecircumflex ; B 70 -14 593 750 ; -C -1 ; WX 611 ; N thorn ; B 18 -208 645 718 ; -C -1 ; WX 556 ; N egrave ; B 70 -14 593 750 ; -C -1 ; WX 333 ; N twosuperior ; B 69 283 449 710 ; -C -1 ; WX 556 ; N eacute ; B 70 -14 627 750 ; -C -1 ; WX 611 ; N otilde ; B 82 -14 646 737 ; -C -1 ; WX 722 ; N Aacute ; B 20 0 750 936 ; -C -1 ; WX 611 ; N ocircumflex ; B 82 -14 643 750 ; -C -1 ; WX 556 ; N yacute ; B 42 -214 652 750 ; -C -1 ; WX 611 ; N udieresis ; B 98 -14 658 729 ; -C -1 ; WX 834 ; N threequarters ; B 99 -19 839 710 ; -C -1 ; WX 556 ; N acircumflex ; B 55 -14 583 750 ; -C -1 ; WX 722 ; N Eth ; B 62 0 777 718 ; -C -1 ; WX 556 ; N edieresis ; B 70 -14 594 729 ; -C -1 ; WX 611 ; N ugrave ; B 98 -14 658 750 ; -C -1 ; WX 1000 ; N trademark ; B 179 306 1109 718 ; -C -1 ; WX 611 ; N ograve ; B 82 -14 643 750 ; -C -1 ; WX 556 ; N scaron ; B 63 -14 614 750 ; -C -1 ; WX 278 ; N Idieresis ; B 64 0 494 915 ; -C -1 ; WX 611 ; N uacute ; B 98 -14 658 750 ; -C -1 ; WX 556 ; N agrave ; B 55 -14 583 750 ; -C -1 ; WX 611 ; N ntilde ; B 65 0 646 737 ; -C -1 ; WX 556 ; N aring ; B 55 -14 583 776 ; -C -1 ; WX 500 ; N zcaron ; B 20 0 586 750 ; -C -1 ; WX 278 ; N Icircumflex ; B 64 0 484 936 ; -C -1 ; WX 722 ; N Ntilde ; B 69 0 807 923 ; -C -1 ; WX 611 ; N ucircumflex ; B 98 -14 658 750 ; -C -1 ; WX 667 ; N Ecircumflex ; B 76 0 757 936 ; -C -1 ; WX 278 ; N Iacute ; B 64 0 528 936 ; -C -1 ; WX 722 ; N Ccedilla ; B 107 -228 789 737 ; -C -1 ; WX 778 ; N Odieresis ; B 107 -19 823 915 ; -C -1 ; WX 667 ; N Scaron ; B 81 -19 718 936 ; -C -1 ; WX 667 ; N Edieresis ; B 76 0 757 915 ; -C -1 ; WX 278 ; N Igrave ; B 64 0 367 936 ; -C -1 ; WX 556 ; N adieresis ; B 55 -14 594 729 ; -C -1 ; WX 778 ; N Ograve ; B 107 -19 823 936 ; -C -1 ; WX 667 ; N Egrave ; B 76 0 757 936 ; -C -1 ; WX 667 ; N Ydieresis ; B 168 0 806 915 ; -C -1 ; WX 737 ; N registered ; B 55 -19 834 737 ; -C -1 ; WX 778 ; N Otilde ; B 107 -19 823 923 ; -C -1 ; WX 834 ; N onequarter ; B 132 -19 806 710 ; -C -1 ; WX 722 ; N Ugrave ; B 116 -19 804 936 ; -C -1 ; WX 722 ; N Ucircumflex ; B 116 -19 804 936 ; -C -1 ; WX 667 ; N Thorn ; B 76 0 716 718 ; -C -1 ; WX 584 ; N divide ; B 82 -42 610 548 ; -C -1 ; WX 722 ; N Atilde ; B 20 0 741 923 ; -C -1 ; WX 722 ; N Uacute ; B 116 -19 804 936 ; -C -1 ; WX 778 ; N Ocircumflex ; B 107 -19 823 936 ; -C -1 ; WX 584 ; N logicalnot ; B 105 108 633 419 ; -C -1 ; WX 722 ; N Aring ; B 20 0 702 962 ; -C -1 ; WX 278 ; N idieresis ; B 69 0 455 729 ; -C -1 ; WX 278 ; N iacute ; B 69 0 488 750 ; -C -1 ; WX 556 ; N aacute ; B 55 -14 627 750 ; -C -1 ; WX 584 ; N plusminus ; B 40 0 625 506 ; -C -1 ; WX 584 ; N multiply ; B 57 1 635 505 ; -C -1 ; WX 722 ; N Udieresis ; B 116 -19 804 915 ; -C -1 ; WX 584 ; N minus ; B 82 197 610 309 ; -C -1 ; WX 333 ; N onesuperior ; B 148 283 388 710 ; -C -1 ; WX 667 ; N Eacute ; B 76 0 757 936 ; -C -1 ; WX 722 ; N Acircumflex ; B 20 0 706 936 ; -C -1 ; WX 737 ; N copyright ; B 56 -19 835 737 ; -C -1 ; WX 722 ; N Agrave ; B 20 0 702 936 ; -C -1 ; WX 611 ; N odieresis ; B 82 -14 643 729 ; -C -1 ; WX 611 ; N oacute ; B 82 -14 654 750 ; -C -1 ; WX 400 ; N degree ; B 175 426 467 712 ; -C -1 ; WX 278 ; N igrave ; B 69 0 326 750 ; -C -1 ; WX 611 ; N mu ; B 22 -207 658 532 ; -C -1 ; WX 778 ; N Oacute ; B 107 -19 823 936 ; -C -1 ; WX 611 ; N eth ; B 82 -14 670 737 ; -C -1 ; WX 722 ; N Adieresis ; B 20 0 716 915 ; -C -1 ; WX 667 ; N Yacute ; B 168 0 806 936 ; -C -1 ; WX 280 ; N brokenbar ; B 80 -19 353 737 ; -C -1 ; WX 834 ; N onehalf ; B 132 -19 858 710 ; -EndCharMetrics -StartKernData -StartKernPairs 209 - -KPX A y -30 -KPX A w -30 -KPX A v -40 -KPX A u -30 -KPX A Y -110 -KPX A W -60 -KPX A V -80 -KPX A U -50 -KPX A T -90 -KPX A Q -40 -KPX A O -40 -KPX A G -50 -KPX A C -40 - -KPX B U -10 -KPX B A -30 - -KPX D period -30 -KPX D comma -30 -KPX D Y -70 -KPX D W -40 -KPX D V -40 -KPX D A -40 - -KPX F period -100 -KPX F comma -100 -KPX F a -20 -KPX F A -80 - -KPX J u -20 -KPX J period -20 -KPX J comma -20 -KPX J A -20 - -KPX K y -40 -KPX K u -30 -KPX K o -35 -KPX K e -15 -KPX K O -30 - -KPX L y -30 -KPX L quoteright -140 -KPX L quotedblright -140 -KPX L Y -120 -KPX L W -80 -KPX L V -110 -KPX L T -90 - -KPX O period -40 -KPX O comma -40 -KPX O Y -70 -KPX O X -50 -KPX O W -50 -KPX O V -50 -KPX O T -40 -KPX O A -50 - -KPX P period -120 -KPX P o -40 -KPX P e -30 -KPX P comma -120 -KPX P a -30 -KPX P A -100 - -KPX Q period 20 -KPX Q comma 20 -KPX Q U -10 - -KPX R Y -50 -KPX R W -40 -KPX R V -50 -KPX R U -20 -KPX R T -20 -KPX R O -20 - -KPX T y -60 -KPX T w -60 -KPX T u -90 -KPX T semicolon -40 -KPX T r -80 -KPX T period -80 -KPX T o -80 -KPX T hyphen -120 -KPX T e -60 -KPX T comma -80 -KPX T colon -40 -KPX T a -80 -KPX T O -40 -KPX T A -90 - -KPX U period -30 -KPX U comma -30 -KPX U A -50 - -KPX V u -60 -KPX V semicolon -40 -KPX V period -120 -KPX V o -90 -KPX V hyphen -80 -KPX V e -50 -KPX V comma -120 -KPX V colon -40 -KPX V a -60 -KPX V O -50 -KPX V G -50 -KPX V A -80 - -KPX W y -20 -KPX W u -45 -KPX W semicolon -10 -KPX W period -80 -KPX W o -60 -KPX W hyphen -40 -KPX W e -35 -KPX W comma -80 -KPX W colon -10 -KPX W a -40 -KPX W O -20 -KPX W A -60 - -KPX Y u -100 -KPX Y semicolon -50 -KPX Y period -100 -KPX Y o -100 -KPX Y e -80 -KPX Y comma -100 -KPX Y colon -50 -KPX Y a -90 -KPX Y O -70 -KPX Y A -110 - -KPX a y -20 -KPX a w -15 -KPX a v -15 -KPX a g -10 - -KPX b y -20 -KPX b v -20 -KPX b u -20 -KPX b l -10 - -KPX c y -10 -KPX c l -20 -KPX c k -20 -KPX c h -10 - -KPX colon space -40 - -KPX comma space -40 -KPX comma quoteright -120 -KPX comma quotedblright -120 - -KPX d y -15 -KPX d w -15 -KPX d v -15 -KPX d d -10 - -KPX e y -15 -KPX e x -15 -KPX e w -15 -KPX e v -15 -KPX e period 20 -KPX e comma 10 - -KPX f quoteright 30 -KPX f quotedblright 30 -KPX f period -10 -KPX f o -20 -KPX f e -10 -KPX f comma -10 - -KPX g g -10 -KPX g e 10 - -KPX h y -20 - -KPX k o -15 - -KPX l y -15 -KPX l w -15 - -KPX m y -30 -KPX m u -20 - -KPX n y -20 -KPX n v -40 -KPX n u -10 - -KPX o y -20 -KPX o x -30 -KPX o w -15 -KPX o v -20 - -KPX p y -15 - -KPX period space -40 -KPX period quoteright -120 -KPX period quotedblright -120 - -KPX quotedblright space -80 - -KPX quoteleft quoteleft -46 - -KPX quoteright v -20 -KPX quoteright space -80 -KPX quoteright s -60 -KPX quoteright r -40 -KPX quoteright quoteright -46 -KPX quoteright l -20 -KPX quoteright d -80 - -KPX r y 10 -KPX r v 10 -KPX r t 20 -KPX r s -15 -KPX r q -20 -KPX r period -60 -KPX r o -20 -KPX r hyphen -20 -KPX r g -15 -KPX r d -20 -KPX r comma -60 -KPX r c -20 - -KPX s w -15 - -KPX semicolon space -40 - -KPX space quoteleft -60 -KPX space quotedblleft -80 -KPX space Y -120 -KPX space W -80 -KPX space V -80 -KPX space T -100 - -KPX v period -80 -KPX v o -30 -KPX v comma -80 -KPX v a -20 - -KPX w period -40 -KPX w o -20 -KPX w comma -40 - -KPX x e -10 - -KPX y period -80 -KPX y o -25 -KPX y e -10 -KPX y comma -80 -KPX y a -30 - -KPX z e 10 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 235 186 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 235 186 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 235 186 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 235 186 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 235 186 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 235 186 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 215 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 207 186 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 207 186 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 207 186 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 207 186 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 13 186 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 13 186 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 13 186 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 13 186 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 235 186 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 263 186 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 263 186 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 263 186 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 263 186 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 263 186 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 207 186 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 235 186 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 235 186 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 235 186 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 235 186 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 207 186 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 207 186 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 179 186 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 112 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 112 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 112 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 112 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 112 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 112 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 132 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 112 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 112 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 112 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 112 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 139 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 139 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 139 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 139 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 139 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 139 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 112 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 139 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 139 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 139 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 139 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 112 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 112 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 84 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Helvetica-Oblique.afm b/config/psfonts/Helvetica-Oblique.afm deleted file mode 100644 index 3d69eb7c..00000000 --- a/config/psfonts/Helvetica-Oblique.afm +++ /dev/null @@ -1,612 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All rights reserved. -Comment Creation Date: Thu Mar 15 10:24:18 1990 -Comment UniqueID 28362 -Comment VMusage 7572 42473 -FontName Helvetica-Oblique -FullName Helvetica Oblique -FamilyName Helvetica -Weight Medium -ItalicAngle -12 -IsFixedPitch false -FontBBox -170 -225 1116 931 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.006 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All rights reserved.Helvetica is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 718 -XHeight 523 -Ascender 718 -Descender -207 -StartCharMetrics 228 -C 32 ; WX 278 ; N space ; B 0 0 0 0 ; -C 33 ; WX 278 ; N exclam ; B 90 0 340 718 ; -C 34 ; WX 355 ; N quotedbl ; B 168 463 438 718 ; -C 35 ; WX 556 ; N numbersign ; B 73 0 631 688 ; -C 36 ; WX 556 ; N dollar ; B 69 -115 617 775 ; -C 37 ; WX 889 ; N percent ; B 147 -19 889 703 ; -C 38 ; WX 667 ; N ampersand ; B 77 -15 647 718 ; -C 39 ; WX 222 ; N quoteright ; B 151 463 310 718 ; -C 40 ; WX 333 ; N parenleft ; B 108 -207 454 733 ; -C 41 ; WX 333 ; N parenright ; B -9 -207 337 733 ; -C 42 ; WX 389 ; N asterisk ; B 165 431 475 718 ; -C 43 ; WX 584 ; N plus ; B 85 0 606 505 ; -C 44 ; WX 278 ; N comma ; B 56 -147 214 106 ; -C 45 ; WX 333 ; N hyphen ; B 93 232 357 322 ; -C 46 ; WX 278 ; N period ; B 87 0 214 106 ; -C 47 ; WX 278 ; N slash ; B -21 -19 452 737 ; -C 48 ; WX 556 ; N zero ; B 93 -19 608 703 ; -C 49 ; WX 556 ; N one ; B 207 0 508 703 ; -C 50 ; WX 556 ; N two ; B 26 0 617 703 ; -C 51 ; WX 556 ; N three ; B 75 -19 610 703 ; -C 52 ; WX 556 ; N four ; B 61 0 576 703 ; -C 53 ; WX 556 ; N five ; B 68 -19 621 688 ; -C 54 ; WX 556 ; N six ; B 91 -19 615 703 ; -C 55 ; WX 556 ; N seven ; B 137 0 669 688 ; -C 56 ; WX 556 ; N eight ; B 74 -19 607 703 ; -C 57 ; WX 556 ; N nine ; B 82 -19 609 703 ; -C 58 ; WX 278 ; N colon ; B 87 0 301 516 ; -C 59 ; WX 278 ; N semicolon ; B 56 -147 301 516 ; -C 60 ; WX 584 ; N less ; B 94 11 641 495 ; -C 61 ; WX 584 ; N equal ; B 63 115 628 390 ; -C 62 ; WX 584 ; N greater ; B 50 11 597 495 ; -C 63 ; WX 556 ; N question ; B 161 0 610 727 ; -C 64 ; WX 1015 ; N at ; B 215 -19 965 737 ; -C 65 ; WX 667 ; N A ; B 14 0 654 718 ; -C 66 ; WX 667 ; N B ; B 74 0 712 718 ; -C 67 ; WX 722 ; N C ; B 108 -19 782 737 ; -C 68 ; WX 722 ; N D ; B 81 0 764 718 ; -C 69 ; WX 667 ; N E ; B 86 0 762 718 ; -C 70 ; WX 611 ; N F ; B 86 0 736 718 ; -C 71 ; WX 778 ; N G ; B 111 -19 799 737 ; -C 72 ; WX 722 ; N H ; B 77 0 799 718 ; -C 73 ; WX 278 ; N I ; B 91 0 341 718 ; -C 74 ; WX 500 ; N J ; B 47 -19 581 718 ; -C 75 ; WX 667 ; N K ; B 76 0 808 718 ; -C 76 ; WX 556 ; N L ; B 76 0 555 718 ; -C 77 ; WX 833 ; N M ; B 73 0 914 718 ; -C 78 ; WX 722 ; N N ; B 76 0 799 718 ; -C 79 ; WX 778 ; N O ; B 105 -19 826 737 ; -C 80 ; WX 667 ; N P ; B 86 0 737 718 ; -C 81 ; WX 778 ; N Q ; B 105 -56 826 737 ; -C 82 ; WX 722 ; N R ; B 88 0 773 718 ; -C 83 ; WX 667 ; N S ; B 90 -19 713 737 ; -C 84 ; WX 611 ; N T ; B 148 0 750 718 ; -C 85 ; WX 722 ; N U ; B 123 -19 797 718 ; -C 86 ; WX 667 ; N V ; B 173 0 800 718 ; -C 87 ; WX 944 ; N W ; B 169 0 1081 718 ; -C 88 ; WX 667 ; N X ; B 19 0 790 718 ; -C 89 ; WX 667 ; N Y ; B 167 0 806 718 ; -C 90 ; WX 611 ; N Z ; B 23 0 741 718 ; -C 91 ; WX 278 ; N bracketleft ; B 21 -196 403 722 ; -C 92 ; WX 278 ; N backslash ; B 140 -19 291 737 ; -C 93 ; WX 278 ; N bracketright ; B -14 -196 368 722 ; -C 94 ; WX 469 ; N asciicircum ; B 42 264 539 688 ; -C 95 ; WX 556 ; N underscore ; B -27 -125 540 -75 ; -C 96 ; WX 222 ; N quoteleft ; B 165 470 323 725 ; -C 97 ; WX 556 ; N a ; B 61 -15 559 538 ; -C 98 ; WX 556 ; N b ; B 58 -15 584 718 ; -C 99 ; WX 500 ; N c ; B 74 -15 553 538 ; -C 100 ; WX 556 ; N d ; B 84 -15 652 718 ; -C 101 ; WX 556 ; N e ; B 84 -15 578 538 ; -C 102 ; WX 278 ; N f ; B 86 0 416 728 ; L i fi ; L l fl ; -C 103 ; WX 556 ; N g ; B 42 -220 610 538 ; -C 104 ; WX 556 ; N h ; B 65 0 573 718 ; -C 105 ; WX 222 ; N i ; B 67 0 308 718 ; -C 106 ; WX 222 ; N j ; B -60 -210 308 718 ; -C 107 ; WX 500 ; N k ; B 67 0 600 718 ; -C 108 ; WX 222 ; N l ; B 67 0 308 718 ; -C 109 ; WX 833 ; N m ; B 65 0 852 538 ; -C 110 ; WX 556 ; N n ; B 65 0 573 538 ; -C 111 ; WX 556 ; N o ; B 83 -14 585 538 ; -C 112 ; WX 556 ; N p ; B 14 -207 584 538 ; -C 113 ; WX 556 ; N q ; B 84 -207 605 538 ; -C 114 ; WX 333 ; N r ; B 77 0 446 538 ; -C 115 ; WX 500 ; N s ; B 63 -15 529 538 ; -C 116 ; WX 278 ; N t ; B 102 -7 368 669 ; -C 117 ; WX 556 ; N u ; B 94 -15 600 523 ; -C 118 ; WX 500 ; N v ; B 119 0 603 523 ; -C 119 ; WX 722 ; N w ; B 125 0 820 523 ; -C 120 ; WX 500 ; N x ; B 11 0 594 523 ; -C 121 ; WX 500 ; N y ; B 15 -214 600 523 ; -C 122 ; WX 500 ; N z ; B 31 0 571 523 ; -C 123 ; WX 334 ; N braceleft ; B 92 -196 445 722 ; -C 124 ; WX 260 ; N bar ; B 90 -19 324 737 ; -C 125 ; WX 334 ; N braceright ; B 0 -196 354 722 ; -C 126 ; WX 584 ; N asciitilde ; B 111 180 580 326 ; -C 161 ; WX 333 ; N exclamdown ; B 77 -195 326 523 ; -C 162 ; WX 556 ; N cent ; B 95 -115 584 623 ; -C 163 ; WX 556 ; N sterling ; B 49 -16 634 718 ; -C 164 ; WX 167 ; N fraction ; B -170 -19 482 703 ; -C 165 ; WX 556 ; N yen ; B 81 0 699 688 ; -C 166 ; WX 556 ; N florin ; B -52 -207 654 737 ; -C 167 ; WX 556 ; N section ; B 76 -191 584 737 ; -C 168 ; WX 556 ; N currency ; B 60 99 646 603 ; -C 169 ; WX 191 ; N quotesingle ; B 157 463 285 718 ; -C 170 ; WX 333 ; N quotedblleft ; B 138 470 461 725 ; -C 171 ; WX 556 ; N guillemotleft ; B 146 108 554 446 ; -C 172 ; WX 333 ; N guilsinglleft ; B 137 108 340 446 ; -C 173 ; WX 333 ; N guilsinglright ; B 111 108 314 446 ; -C 174 ; WX 500 ; N fi ; B 86 0 587 728 ; -C 175 ; WX 500 ; N fl ; B 86 0 585 728 ; -C 177 ; WX 556 ; N endash ; B 51 240 623 313 ; -C 178 ; WX 556 ; N dagger ; B 135 -159 622 718 ; -C 179 ; WX 556 ; N daggerdbl ; B 52 -159 623 718 ; -C 180 ; WX 278 ; N periodcentered ; B 129 190 257 315 ; -C 182 ; WX 537 ; N paragraph ; B 126 -173 650 718 ; -C 183 ; WX 350 ; N bullet ; B 91 202 413 517 ; -C 184 ; WX 222 ; N quotesinglbase ; B 21 -149 180 106 ; -C 185 ; WX 333 ; N quotedblbase ; B -6 -149 318 106 ; -C 186 ; WX 333 ; N quotedblright ; B 124 463 448 718 ; -C 187 ; WX 556 ; N guillemotright ; B 120 108 528 446 ; -C 188 ; WX 1000 ; N ellipsis ; B 115 0 908 106 ; -C 189 ; WX 1000 ; N perthousand ; B 88 -19 1029 703 ; -C 191 ; WX 611 ; N questiondown ; B 85 -201 534 525 ; -C 193 ; WX 333 ; N grave ; B 170 593 337 734 ; -C 194 ; WX 333 ; N acute ; B 248 593 475 734 ; -C 195 ; WX 333 ; N circumflex ; B 147 593 438 734 ; -C 196 ; WX 333 ; N tilde ; B 125 606 490 722 ; -C 197 ; WX 333 ; N macron ; B 143 627 468 684 ; -C 198 ; WX 333 ; N breve ; B 167 595 476 731 ; -C 199 ; WX 333 ; N dotaccent ; B 249 604 362 706 ; -C 200 ; WX 333 ; N dieresis ; B 168 604 443 706 ; -C 202 ; WX 333 ; N ring ; B 214 572 402 756 ; -C 203 ; WX 333 ; N cedilla ; B 2 -225 232 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B 157 593 565 734 ; -C 206 ; WX 333 ; N ogonek ; B 43 -225 249 0 ; -C 207 ; WX 333 ; N caron ; B 177 593 468 734 ; -C 208 ; WX 1000 ; N emdash ; B 51 240 1067 313 ; -C 225 ; WX 1000 ; N AE ; B 8 0 1097 718 ; -C 227 ; WX 370 ; N ordfeminine ; B 100 304 449 737 ; -C 232 ; WX 556 ; N Lslash ; B 41 0 555 718 ; -C 233 ; WX 778 ; N Oslash ; B 43 -19 890 737 ; -C 234 ; WX 1000 ; N OE ; B 98 -19 1116 737 ; -C 235 ; WX 365 ; N ordmasculine ; B 100 304 468 737 ; -C 241 ; WX 889 ; N ae ; B 61 -15 909 538 ; -C 245 ; WX 278 ; N dotlessi ; B 95 0 294 523 ; -C 248 ; WX 222 ; N lslash ; B 41 0 347 718 ; -C 249 ; WX 611 ; N oslash ; B 29 -22 647 545 ; -C 250 ; WX 944 ; N oe ; B 83 -15 964 538 ; -C 251 ; WX 611 ; N germandbls ; B 67 -15 658 728 ; -C -1 ; WX 611 ; N Zcaron ; B 23 0 741 929 ; -C -1 ; WX 500 ; N ccedilla ; B 74 -225 553 538 ; -C -1 ; WX 500 ; N ydieresis ; B 15 -214 600 706 ; -C -1 ; WX 556 ; N atilde ; B 61 -15 592 722 ; -C -1 ; WX 278 ; N icircumflex ; B 95 0 411 734 ; -C -1 ; WX 333 ; N threesuperior ; B 90 270 436 703 ; -C -1 ; WX 556 ; N ecircumflex ; B 84 -15 578 734 ; -C -1 ; WX 556 ; N thorn ; B 14 -207 584 718 ; -C -1 ; WX 556 ; N egrave ; B 84 -15 578 734 ; -C -1 ; WX 333 ; N twosuperior ; B 64 281 449 703 ; -C -1 ; WX 556 ; N eacute ; B 84 -15 587 734 ; -C -1 ; WX 556 ; N otilde ; B 83 -14 602 722 ; -C -1 ; WX 667 ; N Aacute ; B 14 0 683 929 ; -C -1 ; WX 556 ; N ocircumflex ; B 83 -14 585 734 ; -C -1 ; WX 500 ; N yacute ; B 15 -214 600 734 ; -C -1 ; WX 556 ; N udieresis ; B 94 -15 600 706 ; -C -1 ; WX 834 ; N threequarters ; B 130 -19 861 703 ; -C -1 ; WX 556 ; N acircumflex ; B 61 -15 559 734 ; -C -1 ; WX 722 ; N Eth ; B 69 0 764 718 ; -C -1 ; WX 556 ; N edieresis ; B 84 -15 578 706 ; -C -1 ; WX 556 ; N ugrave ; B 94 -15 600 734 ; -C -1 ; WX 1000 ; N trademark ; B 186 306 1056 718 ; -C -1 ; WX 556 ; N ograve ; B 83 -14 585 734 ; -C -1 ; WX 500 ; N scaron ; B 63 -15 552 734 ; -C -1 ; WX 278 ; N Idieresis ; B 91 0 458 901 ; -C -1 ; WX 556 ; N uacute ; B 94 -15 600 734 ; -C -1 ; WX 556 ; N agrave ; B 61 -15 559 734 ; -C -1 ; WX 556 ; N ntilde ; B 65 0 592 722 ; -C -1 ; WX 556 ; N aring ; B 61 -15 559 756 ; -C -1 ; WX 500 ; N zcaron ; B 31 0 571 734 ; -C -1 ; WX 278 ; N Icircumflex ; B 91 0 452 929 ; -C -1 ; WX 722 ; N Ntilde ; B 76 0 799 917 ; -C -1 ; WX 556 ; N ucircumflex ; B 94 -15 600 734 ; -C -1 ; WX 667 ; N Ecircumflex ; B 86 0 762 929 ; -C -1 ; WX 278 ; N Iacute ; B 91 0 489 929 ; -C -1 ; WX 722 ; N Ccedilla ; B 108 -225 782 737 ; -C -1 ; WX 778 ; N Odieresis ; B 105 -19 826 901 ; -C -1 ; WX 667 ; N Scaron ; B 90 -19 713 929 ; -C -1 ; WX 667 ; N Edieresis ; B 86 0 762 901 ; -C -1 ; WX 278 ; N Igrave ; B 91 0 351 929 ; -C -1 ; WX 556 ; N adieresis ; B 61 -15 559 706 ; -C -1 ; WX 778 ; N Ograve ; B 105 -19 826 929 ; -C -1 ; WX 667 ; N Egrave ; B 86 0 762 929 ; -C -1 ; WX 667 ; N Ydieresis ; B 167 0 806 901 ; -C -1 ; WX 737 ; N registered ; B 54 -19 837 737 ; -C -1 ; WX 778 ; N Otilde ; B 105 -19 826 917 ; -C -1 ; WX 834 ; N onequarter ; B 150 -19 802 703 ; -C -1 ; WX 722 ; N Ugrave ; B 123 -19 797 929 ; -C -1 ; WX 722 ; N Ucircumflex ; B 123 -19 797 929 ; -C -1 ; WX 667 ; N Thorn ; B 86 0 712 718 ; -C -1 ; WX 584 ; N divide ; B 85 -19 606 524 ; -C -1 ; WX 667 ; N Atilde ; B 14 0 699 917 ; -C -1 ; WX 722 ; N Uacute ; B 123 -19 797 929 ; -C -1 ; WX 778 ; N Ocircumflex ; B 105 -19 826 929 ; -C -1 ; WX 584 ; N logicalnot ; B 106 108 628 390 ; -C -1 ; WX 667 ; N Aring ; B 14 0 654 931 ; -C -1 ; WX 278 ; N idieresis ; B 95 0 416 706 ; -C -1 ; WX 278 ; N iacute ; B 95 0 448 734 ; -C -1 ; WX 556 ; N aacute ; B 61 -15 587 734 ; -C -1 ; WX 584 ; N plusminus ; B 39 0 618 506 ; -C -1 ; WX 584 ; N multiply ; B 50 0 642 506 ; -C -1 ; WX 722 ; N Udieresis ; B 123 -19 797 901 ; -C -1 ; WX 584 ; N minus ; B 85 216 606 289 ; -C -1 ; WX 333 ; N onesuperior ; B 166 281 371 703 ; -C -1 ; WX 667 ; N Eacute ; B 86 0 762 929 ; -C -1 ; WX 667 ; N Acircumflex ; B 14 0 654 929 ; -C -1 ; WX 737 ; N copyright ; B 54 -19 837 737 ; -C -1 ; WX 667 ; N Agrave ; B 14 0 654 929 ; -C -1 ; WX 556 ; N odieresis ; B 83 -14 585 706 ; -C -1 ; WX 556 ; N oacute ; B 83 -14 587 734 ; -C -1 ; WX 400 ; N degree ; B 169 411 468 703 ; -C -1 ; WX 278 ; N igrave ; B 95 0 310 734 ; -C -1 ; WX 556 ; N mu ; B 24 -207 600 523 ; -C -1 ; WX 778 ; N Oacute ; B 105 -19 826 929 ; -C -1 ; WX 556 ; N eth ; B 81 -15 617 737 ; -C -1 ; WX 667 ; N Adieresis ; B 14 0 654 901 ; -C -1 ; WX 667 ; N Yacute ; B 167 0 806 929 ; -C -1 ; WX 260 ; N brokenbar ; B 90 -19 324 737 ; -C -1 ; WX 834 ; N onehalf ; B 114 -19 839 703 ; -EndCharMetrics -StartKernData -StartKernPairs 250 - -KPX A y -40 -KPX A w -40 -KPX A v -40 -KPX A u -30 -KPX A Y -100 -KPX A W -50 -KPX A V -70 -KPX A U -50 -KPX A T -120 -KPX A Q -30 -KPX A O -30 -KPX A G -30 -KPX A C -30 - -KPX B period -20 -KPX B comma -20 -KPX B U -10 - -KPX C period -30 -KPX C comma -30 - -KPX D period -70 -KPX D comma -70 -KPX D Y -90 -KPX D W -40 -KPX D V -70 -KPX D A -40 - -KPX F r -45 -KPX F period -150 -KPX F o -30 -KPX F e -30 -KPX F comma -150 -KPX F a -50 -KPX F A -80 - -KPX J u -20 -KPX J period -30 -KPX J comma -30 -KPX J a -20 -KPX J A -20 - -KPX K y -50 -KPX K u -30 -KPX K o -40 -KPX K e -40 -KPX K O -50 - -KPX L y -30 -KPX L quoteright -160 -KPX L quotedblright -140 -KPX L Y -140 -KPX L W -70 -KPX L V -110 -KPX L T -110 - -KPX O period -40 -KPX O comma -40 -KPX O Y -70 -KPX O X -60 -KPX O W -30 -KPX O V -50 -KPX O T -40 -KPX O A -20 - -KPX P period -180 -KPX P o -50 -KPX P e -50 -KPX P comma -180 -KPX P a -40 -KPX P A -120 - -KPX Q U -10 - -KPX R Y -50 -KPX R W -30 -KPX R V -50 -KPX R U -40 -KPX R T -30 -KPX R O -20 - -KPX S period -20 -KPX S comma -20 - -KPX T y -120 -KPX T w -120 -KPX T u -120 -KPX T semicolon -20 -KPX T r -120 -KPX T period -120 -KPX T o -120 -KPX T hyphen -140 -KPX T e -120 -KPX T comma -120 -KPX T colon -20 -KPX T a -120 -KPX T O -40 -KPX T A -120 - -KPX U period -40 -KPX U comma -40 -KPX U A -40 - -KPX V u -70 -KPX V semicolon -40 -KPX V period -125 -KPX V o -80 -KPX V hyphen -80 -KPX V e -80 -KPX V comma -125 -KPX V colon -40 -KPX V a -70 -KPX V O -40 -KPX V G -40 -KPX V A -80 - -KPX W y -20 -KPX W u -30 -KPX W period -80 -KPX W o -30 -KPX W hyphen -40 -KPX W e -30 -KPX W comma -80 -KPX W a -40 -KPX W O -20 -KPX W A -50 - -KPX Y u -110 -KPX Y semicolon -60 -KPX Y period -140 -KPX Y o -140 -KPX Y i -20 -KPX Y hyphen -140 -KPX Y e -140 -KPX Y comma -140 -KPX Y colon -60 -KPX Y a -140 -KPX Y O -85 -KPX Y A -110 - -KPX a y -30 -KPX a w -20 -KPX a v -20 - -KPX b y -20 -KPX b v -20 -KPX b u -20 -KPX b period -40 -KPX b l -20 -KPX b comma -40 -KPX b b -10 - -KPX c k -20 -KPX c comma -15 - -KPX colon space -50 - -KPX comma quoteright -100 -KPX comma quotedblright -100 - -KPX e y -20 -KPX e x -30 -KPX e w -20 -KPX e v -30 -KPX e period -15 -KPX e comma -15 - -KPX f quoteright 50 -KPX f quotedblright 60 -KPX f period -30 -KPX f o -30 -KPX f e -30 -KPX f dotlessi -28 -KPX f comma -30 -KPX f a -30 - -KPX g r -10 - -KPX h y -30 - -KPX k o -20 -KPX k e -20 - -KPX m y -15 -KPX m u -10 - -KPX n y -15 -KPX n v -20 -KPX n u -10 - -KPX o y -30 -KPX o x -30 -KPX o w -15 -KPX o v -15 -KPX o period -40 -KPX o comma -40 - -KPX oslash z -55 -KPX oslash y -70 -KPX oslash x -85 -KPX oslash w -70 -KPX oslash v -70 -KPX oslash u -55 -KPX oslash t -55 -KPX oslash s -55 -KPX oslash r -55 -KPX oslash q -55 -KPX oslash period -95 -KPX oslash p -55 -KPX oslash o -55 -KPX oslash n -55 -KPX oslash m -55 -KPX oslash l -55 -KPX oslash k -55 -KPX oslash j -55 -KPX oslash i -55 -KPX oslash h -55 -KPX oslash g -55 -KPX oslash f -55 -KPX oslash e -55 -KPX oslash d -55 -KPX oslash comma -95 -KPX oslash c -55 -KPX oslash b -55 -KPX oslash a -55 - -KPX p y -30 -KPX p period -35 -KPX p comma -35 - -KPX period space -60 -KPX period quoteright -100 -KPX period quotedblright -100 - -KPX quotedblright space -40 - -KPX quoteleft quoteleft -57 - -KPX quoteright space -70 -KPX quoteright s -50 -KPX quoteright r -50 -KPX quoteright quoteright -57 -KPX quoteright d -50 - -KPX r y 30 -KPX r v 30 -KPX r u 15 -KPX r t 40 -KPX r semicolon 30 -KPX r period -50 -KPX r p 30 -KPX r n 25 -KPX r m 25 -KPX r l 15 -KPX r k 15 -KPX r i 15 -KPX r comma -50 -KPX r colon 30 -KPX r a -10 - -KPX s w -30 -KPX s period -15 -KPX s comma -15 - -KPX semicolon space -50 - -KPX space quoteleft -60 -KPX space quotedblleft -30 -KPX space Y -90 -KPX space W -40 -KPX space V -50 -KPX space T -50 - -KPX v period -80 -KPX v o -25 -KPX v e -25 -KPX v comma -80 -KPX v a -25 - -KPX w period -60 -KPX w o -10 -KPX w e -10 -KPX w comma -60 -KPX w a -15 - -KPX x e -30 - -KPX y period -100 -KPX y o -20 -KPX y e -20 -KPX y comma -100 -KPX y a -20 - -KPX z o -15 -KPX z e -15 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 208 195 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 208 195 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 208 195 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 208 195 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 204 175 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 208 195 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 195 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 208 195 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 208 195 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 208 195 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 208 195 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 14 195 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 14 195 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 14 195 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 14 195 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 246 195 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 264 195 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 264 195 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 264 195 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 264 195 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 264 195 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 208 195 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 236 195 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 236 195 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 236 195 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 236 195 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 208 195 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 208 195 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 180 195 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 112 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 112 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 112 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 112 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 112 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 102 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 84 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 112 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 112 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 112 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 112 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 102 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 112 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 112 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 112 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 112 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 112 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 84 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 112 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 112 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 84 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 84 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 84 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Helvetica.afm b/config/psfonts/Helvetica.afm deleted file mode 100644 index 1eb3b448..00000000 --- a/config/psfonts/Helvetica.afm +++ /dev/null @@ -1,612 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All rights reserved. -Comment Creation Date: Thu Mar 15 08:58:00 1990 -Comment UniqueID 28352 -Comment VMusage 26389 33281 -FontName Helvetica -FullName Helvetica -FamilyName Helvetica -Weight Medium -ItalicAngle 0 -IsFixedPitch false -FontBBox -166 -225 1000 931 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.006 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All rights reserved.Helvetica is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 718 -XHeight 523 -Ascender 718 -Descender -207 -StartCharMetrics 228 -C 32 ; WX 278 ; N space ; B 0 0 0 0 ; -C 33 ; WX 278 ; N exclam ; B 90 0 187 718 ; -C 34 ; WX 355 ; N quotedbl ; B 70 463 285 718 ; -C 35 ; WX 556 ; N numbersign ; B 28 0 529 688 ; -C 36 ; WX 556 ; N dollar ; B 32 -115 520 775 ; -C 37 ; WX 889 ; N percent ; B 39 -19 850 703 ; -C 38 ; WX 667 ; N ampersand ; B 44 -15 645 718 ; -C 39 ; WX 222 ; N quoteright ; B 53 463 157 718 ; -C 40 ; WX 333 ; N parenleft ; B 68 -207 299 733 ; -C 41 ; WX 333 ; N parenright ; B 34 -207 265 733 ; -C 42 ; WX 389 ; N asterisk ; B 39 431 349 718 ; -C 43 ; WX 584 ; N plus ; B 39 0 545 505 ; -C 44 ; WX 278 ; N comma ; B 87 -147 191 106 ; -C 45 ; WX 333 ; N hyphen ; B 44 232 289 322 ; -C 46 ; WX 278 ; N period ; B 87 0 191 106 ; -C 47 ; WX 278 ; N slash ; B -17 -19 295 737 ; -C 48 ; WX 556 ; N zero ; B 37 -19 519 703 ; -C 49 ; WX 556 ; N one ; B 101 0 359 703 ; -C 50 ; WX 556 ; N two ; B 26 0 507 703 ; -C 51 ; WX 556 ; N three ; B 34 -19 522 703 ; -C 52 ; WX 556 ; N four ; B 25 0 523 703 ; -C 53 ; WX 556 ; N five ; B 32 -19 514 688 ; -C 54 ; WX 556 ; N six ; B 38 -19 518 703 ; -C 55 ; WX 556 ; N seven ; B 37 0 523 688 ; -C 56 ; WX 556 ; N eight ; B 38 -19 517 703 ; -C 57 ; WX 556 ; N nine ; B 42 -19 514 703 ; -C 58 ; WX 278 ; N colon ; B 87 0 191 516 ; -C 59 ; WX 278 ; N semicolon ; B 87 -147 191 516 ; -C 60 ; WX 584 ; N less ; B 48 11 536 495 ; -C 61 ; WX 584 ; N equal ; B 39 115 545 390 ; -C 62 ; WX 584 ; N greater ; B 48 11 536 495 ; -C 63 ; WX 556 ; N question ; B 56 0 492 727 ; -C 64 ; WX 1015 ; N at ; B 147 -19 868 737 ; -C 65 ; WX 667 ; N A ; B 14 0 654 718 ; -C 66 ; WX 667 ; N B ; B 74 0 627 718 ; -C 67 ; WX 722 ; N C ; B 44 -19 681 737 ; -C 68 ; WX 722 ; N D ; B 81 0 674 718 ; -C 69 ; WX 667 ; N E ; B 86 0 616 718 ; -C 70 ; WX 611 ; N F ; B 86 0 583 718 ; -C 71 ; WX 778 ; N G ; B 48 -19 704 737 ; -C 72 ; WX 722 ; N H ; B 77 0 646 718 ; -C 73 ; WX 278 ; N I ; B 91 0 188 718 ; -C 74 ; WX 500 ; N J ; B 17 -19 428 718 ; -C 75 ; WX 667 ; N K ; B 76 0 663 718 ; -C 76 ; WX 556 ; N L ; B 76 0 537 718 ; -C 77 ; WX 833 ; N M ; B 73 0 761 718 ; -C 78 ; WX 722 ; N N ; B 76 0 646 718 ; -C 79 ; WX 778 ; N O ; B 39 -19 739 737 ; -C 80 ; WX 667 ; N P ; B 86 0 622 718 ; -C 81 ; WX 778 ; N Q ; B 39 -56 739 737 ; -C 82 ; WX 722 ; N R ; B 88 0 684 718 ; -C 83 ; WX 667 ; N S ; B 49 -19 620 737 ; -C 84 ; WX 611 ; N T ; B 14 0 597 718 ; -C 85 ; WX 722 ; N U ; B 79 -19 644 718 ; -C 86 ; WX 667 ; N V ; B 20 0 647 718 ; -C 87 ; WX 944 ; N W ; B 16 0 928 718 ; -C 88 ; WX 667 ; N X ; B 19 0 648 718 ; -C 89 ; WX 667 ; N Y ; B 14 0 653 718 ; -C 90 ; WX 611 ; N Z ; B 23 0 588 718 ; -C 91 ; WX 278 ; N bracketleft ; B 63 -196 250 722 ; -C 92 ; WX 278 ; N backslash ; B -17 -19 295 737 ; -C 93 ; WX 278 ; N bracketright ; B 28 -196 215 722 ; -C 94 ; WX 469 ; N asciicircum ; B -14 264 483 688 ; -C 95 ; WX 556 ; N underscore ; B 0 -125 556 -75 ; -C 96 ; WX 222 ; N quoteleft ; B 65 470 169 725 ; -C 97 ; WX 556 ; N a ; B 36 -15 530 538 ; -C 98 ; WX 556 ; N b ; B 58 -15 517 718 ; -C 99 ; WX 500 ; N c ; B 30 -15 477 538 ; -C 100 ; WX 556 ; N d ; B 35 -15 499 718 ; -C 101 ; WX 556 ; N e ; B 40 -15 516 538 ; -C 102 ; WX 278 ; N f ; B 14 0 262 728 ; L i fi ; L l fl ; -C 103 ; WX 556 ; N g ; B 40 -220 499 538 ; -C 104 ; WX 556 ; N h ; B 65 0 491 718 ; -C 105 ; WX 222 ; N i ; B 67 0 155 718 ; -C 106 ; WX 222 ; N j ; B -16 -210 155 718 ; -C 107 ; WX 500 ; N k ; B 67 0 501 718 ; -C 108 ; WX 222 ; N l ; B 67 0 155 718 ; -C 109 ; WX 833 ; N m ; B 65 0 769 538 ; -C 110 ; WX 556 ; N n ; B 65 0 491 538 ; -C 111 ; WX 556 ; N o ; B 35 -14 521 538 ; -C 112 ; WX 556 ; N p ; B 58 -207 517 538 ; -C 113 ; WX 556 ; N q ; B 35 -207 494 538 ; -C 114 ; WX 333 ; N r ; B 77 0 332 538 ; -C 115 ; WX 500 ; N s ; B 32 -15 464 538 ; -C 116 ; WX 278 ; N t ; B 14 -7 257 669 ; -C 117 ; WX 556 ; N u ; B 68 -15 489 523 ; -C 118 ; WX 500 ; N v ; B 8 0 492 523 ; -C 119 ; WX 722 ; N w ; B 14 0 709 523 ; -C 120 ; WX 500 ; N x ; B 11 0 490 523 ; -C 121 ; WX 500 ; N y ; B 11 -214 489 523 ; -C 122 ; WX 500 ; N z ; B 31 0 469 523 ; -C 123 ; WX 334 ; N braceleft ; B 42 -196 292 722 ; -C 124 ; WX 260 ; N bar ; B 94 -19 167 737 ; -C 125 ; WX 334 ; N braceright ; B 42 -196 292 722 ; -C 126 ; WX 584 ; N asciitilde ; B 61 180 523 326 ; -C 161 ; WX 333 ; N exclamdown ; B 118 -195 215 523 ; -C 162 ; WX 556 ; N cent ; B 51 -115 513 623 ; -C 163 ; WX 556 ; N sterling ; B 33 -16 539 718 ; -C 164 ; WX 167 ; N fraction ; B -166 -19 333 703 ; -C 165 ; WX 556 ; N yen ; B 3 0 553 688 ; -C 166 ; WX 556 ; N florin ; B -11 -207 501 737 ; -C 167 ; WX 556 ; N section ; B 43 -191 512 737 ; -C 168 ; WX 556 ; N currency ; B 28 99 528 603 ; -C 169 ; WX 191 ; N quotesingle ; B 59 463 132 718 ; -C 170 ; WX 333 ; N quotedblleft ; B 38 470 307 725 ; -C 171 ; WX 556 ; N guillemotleft ; B 97 108 459 446 ; -C 172 ; WX 333 ; N guilsinglleft ; B 88 108 245 446 ; -C 173 ; WX 333 ; N guilsinglright ; B 88 108 245 446 ; -C 174 ; WX 500 ; N fi ; B 14 0 434 728 ; -C 175 ; WX 500 ; N fl ; B 14 0 432 728 ; -C 177 ; WX 556 ; N endash ; B 0 240 556 313 ; -C 178 ; WX 556 ; N dagger ; B 43 -159 514 718 ; -C 179 ; WX 556 ; N daggerdbl ; B 43 -159 514 718 ; -C 180 ; WX 278 ; N periodcentered ; B 77 190 202 315 ; -C 182 ; WX 537 ; N paragraph ; B 18 -173 497 718 ; -C 183 ; WX 350 ; N bullet ; B 18 202 333 517 ; -C 184 ; WX 222 ; N quotesinglbase ; B 53 -149 157 106 ; -C 185 ; WX 333 ; N quotedblbase ; B 26 -149 295 106 ; -C 186 ; WX 333 ; N quotedblright ; B 26 463 295 718 ; -C 187 ; WX 556 ; N guillemotright ; B 97 108 459 446 ; -C 188 ; WX 1000 ; N ellipsis ; B 115 0 885 106 ; -C 189 ; WX 1000 ; N perthousand ; B 7 -19 994 703 ; -C 191 ; WX 611 ; N questiondown ; B 91 -201 527 525 ; -C 193 ; WX 333 ; N grave ; B 14 593 211 734 ; -C 194 ; WX 333 ; N acute ; B 122 593 319 734 ; -C 195 ; WX 333 ; N circumflex ; B 21 593 312 734 ; -C 196 ; WX 333 ; N tilde ; B -4 606 337 722 ; -C 197 ; WX 333 ; N macron ; B 10 627 323 684 ; -C 198 ; WX 333 ; N breve ; B 13 595 321 731 ; -C 199 ; WX 333 ; N dotaccent ; B 121 604 212 706 ; -C 200 ; WX 333 ; N dieresis ; B 40 604 293 706 ; -C 202 ; WX 333 ; N ring ; B 75 572 259 756 ; -C 203 ; WX 333 ; N cedilla ; B 45 -225 259 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B 31 593 409 734 ; -C 206 ; WX 333 ; N ogonek ; B 73 -225 287 0 ; -C 207 ; WX 333 ; N caron ; B 21 593 312 734 ; -C 208 ; WX 1000 ; N emdash ; B 0 240 1000 313 ; -C 225 ; WX 1000 ; N AE ; B 8 0 951 718 ; -C 227 ; WX 370 ; N ordfeminine ; B 24 304 346 737 ; -C 232 ; WX 556 ; N Lslash ; B -20 0 537 718 ; -C 233 ; WX 778 ; N Oslash ; B 39 -19 740 737 ; -C 234 ; WX 1000 ; N OE ; B 36 -19 965 737 ; -C 235 ; WX 365 ; N ordmasculine ; B 25 304 341 737 ; -C 241 ; WX 889 ; N ae ; B 36 -15 847 538 ; -C 245 ; WX 278 ; N dotlessi ; B 95 0 183 523 ; -C 248 ; WX 222 ; N lslash ; B -20 0 242 718 ; -C 249 ; WX 611 ; N oslash ; B 28 -22 537 545 ; -C 250 ; WX 944 ; N oe ; B 35 -15 902 538 ; -C 251 ; WX 611 ; N germandbls ; B 67 -15 571 728 ; -C -1 ; WX 611 ; N Zcaron ; B 23 0 588 929 ; -C -1 ; WX 500 ; N ccedilla ; B 30 -225 477 538 ; -C -1 ; WX 500 ; N ydieresis ; B 11 -214 489 706 ; -C -1 ; WX 556 ; N atilde ; B 36 -15 530 722 ; -C -1 ; WX 278 ; N icircumflex ; B -6 0 285 734 ; -C -1 ; WX 333 ; N threesuperior ; B 5 270 325 703 ; -C -1 ; WX 556 ; N ecircumflex ; B 40 -15 516 734 ; -C -1 ; WX 556 ; N thorn ; B 58 -207 517 718 ; -C -1 ; WX 556 ; N egrave ; B 40 -15 516 734 ; -C -1 ; WX 333 ; N twosuperior ; B 4 281 323 703 ; -C -1 ; WX 556 ; N eacute ; B 40 -15 516 734 ; -C -1 ; WX 556 ; N otilde ; B 35 -14 521 722 ; -C -1 ; WX 667 ; N Aacute ; B 14 0 654 929 ; -C -1 ; WX 556 ; N ocircumflex ; B 35 -14 521 734 ; -C -1 ; WX 500 ; N yacute ; B 11 -214 489 734 ; -C -1 ; WX 556 ; N udieresis ; B 68 -15 489 706 ; -C -1 ; WX 834 ; N threequarters ; B 45 -19 810 703 ; -C -1 ; WX 556 ; N acircumflex ; B 36 -15 530 734 ; -C -1 ; WX 722 ; N Eth ; B 0 0 674 718 ; -C -1 ; WX 556 ; N edieresis ; B 40 -15 516 706 ; -C -1 ; WX 556 ; N ugrave ; B 68 -15 489 734 ; -C -1 ; WX 1000 ; N trademark ; B 46 306 903 718 ; -C -1 ; WX 556 ; N ograve ; B 35 -14 521 734 ; -C -1 ; WX 500 ; N scaron ; B 32 -15 464 734 ; -C -1 ; WX 278 ; N Idieresis ; B 13 0 266 901 ; -C -1 ; WX 556 ; N uacute ; B 68 -15 489 734 ; -C -1 ; WX 556 ; N agrave ; B 36 -15 530 734 ; -C -1 ; WX 556 ; N ntilde ; B 65 0 491 722 ; -C -1 ; WX 556 ; N aring ; B 36 -15 530 756 ; -C -1 ; WX 500 ; N zcaron ; B 31 0 469 734 ; -C -1 ; WX 278 ; N Icircumflex ; B -6 0 285 929 ; -C -1 ; WX 722 ; N Ntilde ; B 76 0 646 917 ; -C -1 ; WX 556 ; N ucircumflex ; B 68 -15 489 734 ; -C -1 ; WX 667 ; N Ecircumflex ; B 86 0 616 929 ; -C -1 ; WX 278 ; N Iacute ; B 91 0 292 929 ; -C -1 ; WX 722 ; N Ccedilla ; B 44 -225 681 737 ; -C -1 ; WX 778 ; N Odieresis ; B 39 -19 739 901 ; -C -1 ; WX 667 ; N Scaron ; B 49 -19 620 929 ; -C -1 ; WX 667 ; N Edieresis ; B 86 0 616 901 ; -C -1 ; WX 278 ; N Igrave ; B -13 0 188 929 ; -C -1 ; WX 556 ; N adieresis ; B 36 -15 530 706 ; -C -1 ; WX 778 ; N Ograve ; B 39 -19 739 929 ; -C -1 ; WX 667 ; N Egrave ; B 86 0 616 929 ; -C -1 ; WX 667 ; N Ydieresis ; B 14 0 653 901 ; -C -1 ; WX 737 ; N registered ; B -14 -19 752 737 ; -C -1 ; WX 778 ; N Otilde ; B 39 -19 739 917 ; -C -1 ; WX 834 ; N onequarter ; B 73 -19 756 703 ; -C -1 ; WX 722 ; N Ugrave ; B 79 -19 644 929 ; -C -1 ; WX 722 ; N Ucircumflex ; B 79 -19 644 929 ; -C -1 ; WX 667 ; N Thorn ; B 86 0 622 718 ; -C -1 ; WX 584 ; N divide ; B 39 -19 545 524 ; -C -1 ; WX 667 ; N Atilde ; B 14 0 654 917 ; -C -1 ; WX 722 ; N Uacute ; B 79 -19 644 929 ; -C -1 ; WX 778 ; N Ocircumflex ; B 39 -19 739 929 ; -C -1 ; WX 584 ; N logicalnot ; B 39 108 545 390 ; -C -1 ; WX 667 ; N Aring ; B 14 0 654 931 ; -C -1 ; WX 278 ; N idieresis ; B 13 0 266 706 ; -C -1 ; WX 278 ; N iacute ; B 95 0 292 734 ; -C -1 ; WX 556 ; N aacute ; B 36 -15 530 734 ; -C -1 ; WX 584 ; N plusminus ; B 39 0 545 506 ; -C -1 ; WX 584 ; N multiply ; B 39 0 545 506 ; -C -1 ; WX 722 ; N Udieresis ; B 79 -19 644 901 ; -C -1 ; WX 584 ; N minus ; B 39 216 545 289 ; -C -1 ; WX 333 ; N onesuperior ; B 43 281 222 703 ; -C -1 ; WX 667 ; N Eacute ; B 86 0 616 929 ; -C -1 ; WX 667 ; N Acircumflex ; B 14 0 654 929 ; -C -1 ; WX 737 ; N copyright ; B -14 -19 752 737 ; -C -1 ; WX 667 ; N Agrave ; B 14 0 654 929 ; -C -1 ; WX 556 ; N odieresis ; B 35 -14 521 706 ; -C -1 ; WX 556 ; N oacute ; B 35 -14 521 734 ; -C -1 ; WX 400 ; N degree ; B 54 411 346 703 ; -C -1 ; WX 278 ; N igrave ; B -13 0 184 734 ; -C -1 ; WX 556 ; N mu ; B 68 -207 489 523 ; -C -1 ; WX 778 ; N Oacute ; B 39 -19 739 929 ; -C -1 ; WX 556 ; N eth ; B 35 -15 522 737 ; -C -1 ; WX 667 ; N Adieresis ; B 14 0 654 901 ; -C -1 ; WX 667 ; N Yacute ; B 14 0 653 929 ; -C -1 ; WX 260 ; N brokenbar ; B 94 -19 167 737 ; -C -1 ; WX 834 ; N onehalf ; B 43 -19 773 703 ; -EndCharMetrics -StartKernData -StartKernPairs 250 - -KPX A y -40 -KPX A w -40 -KPX A v -40 -KPX A u -30 -KPX A Y -100 -KPX A W -50 -KPX A V -70 -KPX A U -50 -KPX A T -120 -KPX A Q -30 -KPX A O -30 -KPX A G -30 -KPX A C -30 - -KPX B period -20 -KPX B comma -20 -KPX B U -10 - -KPX C period -30 -KPX C comma -30 - -KPX D period -70 -KPX D comma -70 -KPX D Y -90 -KPX D W -40 -KPX D V -70 -KPX D A -40 - -KPX F r -45 -KPX F period -150 -KPX F o -30 -KPX F e -30 -KPX F comma -150 -KPX F a -50 -KPX F A -80 - -KPX J u -20 -KPX J period -30 -KPX J comma -30 -KPX J a -20 -KPX J A -20 - -KPX K y -50 -KPX K u -30 -KPX K o -40 -KPX K e -40 -KPX K O -50 - -KPX L y -30 -KPX L quoteright -160 -KPX L quotedblright -140 -KPX L Y -140 -KPX L W -70 -KPX L V -110 -KPX L T -110 - -KPX O period -40 -KPX O comma -40 -KPX O Y -70 -KPX O X -60 -KPX O W -30 -KPX O V -50 -KPX O T -40 -KPX O A -20 - -KPX P period -180 -KPX P o -50 -KPX P e -50 -KPX P comma -180 -KPX P a -40 -KPX P A -120 - -KPX Q U -10 - -KPX R Y -50 -KPX R W -30 -KPX R V -50 -KPX R U -40 -KPX R T -30 -KPX R O -20 - -KPX S period -20 -KPX S comma -20 - -KPX T y -120 -KPX T w -120 -KPX T u -120 -KPX T semicolon -20 -KPX T r -120 -KPX T period -120 -KPX T o -120 -KPX T hyphen -140 -KPX T e -120 -KPX T comma -120 -KPX T colon -20 -KPX T a -120 -KPX T O -40 -KPX T A -120 - -KPX U period -40 -KPX U comma -40 -KPX U A -40 - -KPX V u -70 -KPX V semicolon -40 -KPX V period -125 -KPX V o -80 -KPX V hyphen -80 -KPX V e -80 -KPX V comma -125 -KPX V colon -40 -KPX V a -70 -KPX V O -40 -KPX V G -40 -KPX V A -80 - -KPX W y -20 -KPX W u -30 -KPX W period -80 -KPX W o -30 -KPX W hyphen -40 -KPX W e -30 -KPX W comma -80 -KPX W a -40 -KPX W O -20 -KPX W A -50 - -KPX Y u -110 -KPX Y semicolon -60 -KPX Y period -140 -KPX Y o -140 -KPX Y i -20 -KPX Y hyphen -140 -KPX Y e -140 -KPX Y comma -140 -KPX Y colon -60 -KPX Y a -140 -KPX Y O -85 -KPX Y A -110 - -KPX a y -30 -KPX a w -20 -KPX a v -20 - -KPX b y -20 -KPX b v -20 -KPX b u -20 -KPX b period -40 -KPX b l -20 -KPX b comma -40 -KPX b b -10 - -KPX c k -20 -KPX c comma -15 - -KPX colon space -50 - -KPX comma quoteright -100 -KPX comma quotedblright -100 - -KPX e y -20 -KPX e x -30 -KPX e w -20 -KPX e v -30 -KPX e period -15 -KPX e comma -15 - -KPX f quoteright 50 -KPX f quotedblright 60 -KPX f period -30 -KPX f o -30 -KPX f e -30 -KPX f dotlessi -28 -KPX f comma -30 -KPX f a -30 - -KPX g r -10 - -KPX h y -30 - -KPX k o -20 -KPX k e -20 - -KPX m y -15 -KPX m u -10 - -KPX n y -15 -KPX n v -20 -KPX n u -10 - -KPX o y -30 -KPX o x -30 -KPX o w -15 -KPX o v -15 -KPX o period -40 -KPX o comma -40 - -KPX oslash z -55 -KPX oslash y -70 -KPX oslash x -85 -KPX oslash w -70 -KPX oslash v -70 -KPX oslash u -55 -KPX oslash t -55 -KPX oslash s -55 -KPX oslash r -55 -KPX oslash q -55 -KPX oslash period -95 -KPX oslash p -55 -KPX oslash o -55 -KPX oslash n -55 -KPX oslash m -55 -KPX oslash l -55 -KPX oslash k -55 -KPX oslash j -55 -KPX oslash i -55 -KPX oslash h -55 -KPX oslash g -55 -KPX oslash f -55 -KPX oslash e -55 -KPX oslash d -55 -KPX oslash comma -95 -KPX oslash c -55 -KPX oslash b -55 -KPX oslash a -55 - -KPX p y -30 -KPX p period -35 -KPX p comma -35 - -KPX period space -60 -KPX period quoteright -100 -KPX period quotedblright -100 - -KPX quotedblright space -40 - -KPX quoteleft quoteleft -57 - -KPX quoteright space -70 -KPX quoteright s -50 -KPX quoteright r -50 -KPX quoteright quoteright -57 -KPX quoteright d -50 - -KPX r y 30 -KPX r v 30 -KPX r u 15 -KPX r t 40 -KPX r semicolon 30 -KPX r period -50 -KPX r p 30 -KPX r n 25 -KPX r m 25 -KPX r l 15 -KPX r k 15 -KPX r i 15 -KPX r comma -50 -KPX r colon 30 -KPX r a -10 - -KPX s w -30 -KPX s period -15 -KPX s comma -15 - -KPX semicolon space -50 - -KPX space quoteleft -60 -KPX space quotedblleft -30 -KPX space Y -90 -KPX space W -40 -KPX space V -50 -KPX space T -50 - -KPX v period -80 -KPX v o -25 -KPX v e -25 -KPX v comma -80 -KPX v a -25 - -KPX w period -60 -KPX w o -10 -KPX w e -10 -KPX w comma -60 -KPX w a -15 - -KPX x e -30 - -KPX y period -100 -KPX y o -20 -KPX y e -20 -KPX y comma -100 -KPX y a -20 - -KPX z o -15 -KPX z e -15 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 167 195 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 167 195 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 167 195 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 167 195 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 167 175 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 167 195 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 195 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 167 195 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 167 195 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 167 195 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 167 195 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute -27 195 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex -27 195 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis -27 195 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave -27 195 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 205 195 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 223 195 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 223 195 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 223 195 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 223 195 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 223 195 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 167 195 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 195 195 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 195 195 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 195 195 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 195 195 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 167 195 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 167 195 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 195 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 112 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 112 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 112 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 112 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 112 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 102 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 84 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 112 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 112 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 112 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 112 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 102 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 112 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 112 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 112 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 112 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 112 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 84 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 112 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 112 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 84 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 84 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 84 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Times-Bold.afm b/config/psfonts/Times-Bold.afm deleted file mode 100644 index 55207f94..00000000 --- a/config/psfonts/Times-Bold.afm +++ /dev/null @@ -1,648 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved. -Comment Creation Date: Tue Mar 20 12:17:14 1990 -Comment UniqueID 28417 -Comment VMusage 30458 37350 -FontName Times-Bold -FullName Times Bold -FamilyName Times -Weight Bold -ItalicAngle 0 -IsFixedPitch false -FontBBox -168 -218 1000 935 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.007 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved.Times is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 676 -XHeight 461 -Ascender 676 -Descender -205 -StartCharMetrics 228 -C 32 ; WX 250 ; N space ; B 0 0 0 0 ; -C 33 ; WX 333 ; N exclam ; B 81 -13 251 691 ; -C 34 ; WX 555 ; N quotedbl ; B 83 404 472 691 ; -C 35 ; WX 500 ; N numbersign ; B 4 0 496 700 ; -C 36 ; WX 500 ; N dollar ; B 29 -99 472 750 ; -C 37 ; WX 1000 ; N percent ; B 124 -14 877 692 ; -C 38 ; WX 833 ; N ampersand ; B 62 -16 787 691 ; -C 39 ; WX 333 ; N quoteright ; B 79 356 263 691 ; -C 40 ; WX 333 ; N parenleft ; B 46 -168 306 694 ; -C 41 ; WX 333 ; N parenright ; B 27 -168 287 694 ; -C 42 ; WX 500 ; N asterisk ; B 56 255 447 691 ; -C 43 ; WX 570 ; N plus ; B 33 0 537 506 ; -C 44 ; WX 250 ; N comma ; B 39 -180 223 155 ; -C 45 ; WX 333 ; N hyphen ; B 44 171 287 287 ; -C 46 ; WX 250 ; N period ; B 41 -13 210 156 ; -C 47 ; WX 278 ; N slash ; B -24 -19 302 691 ; -C 48 ; WX 500 ; N zero ; B 24 -13 476 688 ; -C 49 ; WX 500 ; N one ; B 65 0 442 688 ; -C 50 ; WX 500 ; N two ; B 17 0 478 688 ; -C 51 ; WX 500 ; N three ; B 16 -14 468 688 ; -C 52 ; WX 500 ; N four ; B 19 0 475 688 ; -C 53 ; WX 500 ; N five ; B 22 -8 470 676 ; -C 54 ; WX 500 ; N six ; B 28 -13 475 688 ; -C 55 ; WX 500 ; N seven ; B 17 0 477 676 ; -C 56 ; WX 500 ; N eight ; B 28 -13 472 688 ; -C 57 ; WX 500 ; N nine ; B 26 -13 473 688 ; -C 58 ; WX 333 ; N colon ; B 82 -13 251 472 ; -C 59 ; WX 333 ; N semicolon ; B 82 -180 266 472 ; -C 60 ; WX 570 ; N less ; B 31 -8 539 514 ; -C 61 ; WX 570 ; N equal ; B 33 107 537 399 ; -C 62 ; WX 570 ; N greater ; B 31 -8 539 514 ; -C 63 ; WX 500 ; N question ; B 57 -13 445 689 ; -C 64 ; WX 930 ; N at ; B 108 -19 822 691 ; -C 65 ; WX 722 ; N A ; B 9 0 689 690 ; -C 66 ; WX 667 ; N B ; B 16 0 619 676 ; -C 67 ; WX 722 ; N C ; B 49 -19 687 691 ; -C 68 ; WX 722 ; N D ; B 14 0 690 676 ; -C 69 ; WX 667 ; N E ; B 16 0 641 676 ; -C 70 ; WX 611 ; N F ; B 16 0 583 676 ; -C 71 ; WX 778 ; N G ; B 37 -19 755 691 ; -C 72 ; WX 778 ; N H ; B 21 0 759 676 ; -C 73 ; WX 389 ; N I ; B 20 0 370 676 ; -C 74 ; WX 500 ; N J ; B 3 -96 479 676 ; -C 75 ; WX 778 ; N K ; B 30 0 769 676 ; -C 76 ; WX 667 ; N L ; B 19 0 638 676 ; -C 77 ; WX 944 ; N M ; B 14 0 921 676 ; -C 78 ; WX 722 ; N N ; B 16 -18 701 676 ; -C 79 ; WX 778 ; N O ; B 35 -19 743 691 ; -C 80 ; WX 611 ; N P ; B 16 0 600 676 ; -C 81 ; WX 778 ; N Q ; B 35 -176 743 691 ; -C 82 ; WX 722 ; N R ; B 26 0 715 676 ; -C 83 ; WX 556 ; N S ; B 35 -19 513 692 ; -C 84 ; WX 667 ; N T ; B 31 0 636 676 ; -C 85 ; WX 722 ; N U ; B 16 -19 701 676 ; -C 86 ; WX 722 ; N V ; B 16 -18 701 676 ; -C 87 ; WX 1000 ; N W ; B 19 -15 981 676 ; -C 88 ; WX 722 ; N X ; B 16 0 699 676 ; -C 89 ; WX 722 ; N Y ; B 15 0 699 676 ; -C 90 ; WX 667 ; N Z ; B 28 0 634 676 ; -C 91 ; WX 333 ; N bracketleft ; B 67 -149 301 678 ; -C 92 ; WX 278 ; N backslash ; B -25 -19 303 691 ; -C 93 ; WX 333 ; N bracketright ; B 32 -149 266 678 ; -C 94 ; WX 581 ; N asciicircum ; B 73 311 509 676 ; -C 95 ; WX 500 ; N underscore ; B 0 -125 500 -75 ; -C 96 ; WX 333 ; N quoteleft ; B 70 356 254 691 ; -C 97 ; WX 500 ; N a ; B 25 -14 488 473 ; -C 98 ; WX 556 ; N b ; B 17 -14 521 676 ; -C 99 ; WX 444 ; N c ; B 25 -14 430 473 ; -C 100 ; WX 556 ; N d ; B 25 -14 534 676 ; -C 101 ; WX 444 ; N e ; B 25 -14 426 473 ; -C 102 ; WX 333 ; N f ; B 14 0 389 691 ; L i fi ; L l fl ; -C 103 ; WX 500 ; N g ; B 28 -206 483 473 ; -C 104 ; WX 556 ; N h ; B 16 0 534 676 ; -C 105 ; WX 278 ; N i ; B 16 0 255 691 ; -C 106 ; WX 333 ; N j ; B -57 -203 263 691 ; -C 107 ; WX 556 ; N k ; B 22 0 543 676 ; -C 108 ; WX 278 ; N l ; B 16 0 255 676 ; -C 109 ; WX 833 ; N m ; B 16 0 814 473 ; -C 110 ; WX 556 ; N n ; B 21 0 539 473 ; -C 111 ; WX 500 ; N o ; B 25 -14 476 473 ; -C 112 ; WX 556 ; N p ; B 19 -205 524 473 ; -C 113 ; WX 556 ; N q ; B 34 -205 536 473 ; -C 114 ; WX 444 ; N r ; B 29 0 434 473 ; -C 115 ; WX 389 ; N s ; B 25 -14 361 473 ; -C 116 ; WX 333 ; N t ; B 20 -12 332 630 ; -C 117 ; WX 556 ; N u ; B 16 -14 537 461 ; -C 118 ; WX 500 ; N v ; B 21 -14 485 461 ; -C 119 ; WX 722 ; N w ; B 23 -14 707 461 ; -C 120 ; WX 500 ; N x ; B 12 0 484 461 ; -C 121 ; WX 500 ; N y ; B 16 -205 480 461 ; -C 122 ; WX 444 ; N z ; B 21 0 420 461 ; -C 123 ; WX 394 ; N braceleft ; B 22 -175 340 698 ; -C 124 ; WX 220 ; N bar ; B 66 -19 154 691 ; -C 125 ; WX 394 ; N braceright ; B 54 -175 372 698 ; -C 126 ; WX 520 ; N asciitilde ; B 29 173 491 333 ; -C 161 ; WX 333 ; N exclamdown ; B 82 -203 252 501 ; -C 162 ; WX 500 ; N cent ; B 53 -140 458 588 ; -C 163 ; WX 500 ; N sterling ; B 21 -14 477 684 ; -C 164 ; WX 167 ; N fraction ; B -168 -12 329 688 ; -C 165 ; WX 500 ; N yen ; B -64 0 547 676 ; -C 166 ; WX 500 ; N florin ; B 0 -155 498 706 ; -C 167 ; WX 500 ; N section ; B 57 -132 443 691 ; -C 168 ; WX 500 ; N currency ; B -26 61 526 613 ; -C 169 ; WX 278 ; N quotesingle ; B 75 404 204 691 ; -C 170 ; WX 500 ; N quotedblleft ; B 32 356 486 691 ; -C 171 ; WX 500 ; N guillemotleft ; B 23 36 473 415 ; -C 172 ; WX 333 ; N guilsinglleft ; B 51 36 305 415 ; -C 173 ; WX 333 ; N guilsinglright ; B 28 36 282 415 ; -C 174 ; WX 556 ; N fi ; B 14 0 536 691 ; -C 175 ; WX 556 ; N fl ; B 14 0 536 691 ; -C 177 ; WX 500 ; N endash ; B 0 181 500 271 ; -C 178 ; WX 500 ; N dagger ; B 47 -134 453 691 ; -C 179 ; WX 500 ; N daggerdbl ; B 45 -132 456 691 ; -C 180 ; WX 250 ; N periodcentered ; B 41 248 210 417 ; -C 182 ; WX 540 ; N paragraph ; B 0 -186 519 676 ; -C 183 ; WX 350 ; N bullet ; B 35 198 315 478 ; -C 184 ; WX 333 ; N quotesinglbase ; B 79 -180 263 155 ; -C 185 ; WX 500 ; N quotedblbase ; B 14 -180 468 155 ; -C 186 ; WX 500 ; N quotedblright ; B 14 356 468 691 ; -C 187 ; WX 500 ; N guillemotright ; B 27 36 477 415 ; -C 188 ; WX 1000 ; N ellipsis ; B 82 -13 917 156 ; -C 189 ; WX 1000 ; N perthousand ; B 7 -29 995 706 ; -C 191 ; WX 500 ; N questiondown ; B 55 -201 443 501 ; -C 193 ; WX 333 ; N grave ; B 8 528 246 713 ; -C 194 ; WX 333 ; N acute ; B 86 528 324 713 ; -C 195 ; WX 333 ; N circumflex ; B -2 528 335 704 ; -C 196 ; WX 333 ; N tilde ; B -16 547 349 674 ; -C 197 ; WX 333 ; N macron ; B 1 565 331 637 ; -C 198 ; WX 333 ; N breve ; B 15 528 318 691 ; -C 199 ; WX 333 ; N dotaccent ; B 103 537 230 667 ; -C 200 ; WX 333 ; N dieresis ; B -2 537 335 667 ; -C 202 ; WX 333 ; N ring ; B 60 527 273 740 ; -C 203 ; WX 333 ; N cedilla ; B 68 -218 294 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B -13 528 425 713 ; -C 206 ; WX 333 ; N ogonek ; B 90 -173 319 44 ; -C 207 ; WX 333 ; N caron ; B -2 528 335 704 ; -C 208 ; WX 1000 ; N emdash ; B 0 181 1000 271 ; -C 225 ; WX 1000 ; N AE ; B 4 0 951 676 ; -C 227 ; WX 300 ; N ordfeminine ; B -1 397 301 688 ; -C 232 ; WX 667 ; N Lslash ; B 19 0 638 676 ; -C 233 ; WX 778 ; N Oslash ; B 35 -74 743 737 ; -C 234 ; WX 1000 ; N OE ; B 22 -5 981 684 ; -C 235 ; WX 330 ; N ordmasculine ; B 18 397 312 688 ; -C 241 ; WX 722 ; N ae ; B 33 -14 693 473 ; -C 245 ; WX 278 ; N dotlessi ; B 16 0 255 461 ; -C 248 ; WX 278 ; N lslash ; B -22 0 303 676 ; -C 249 ; WX 500 ; N oslash ; B 25 -92 476 549 ; -C 250 ; WX 722 ; N oe ; B 22 -14 696 473 ; -C 251 ; WX 556 ; N germandbls ; B 19 -12 517 691 ; -C -1 ; WX 667 ; N Zcaron ; B 28 0 634 914 ; -C -1 ; WX 444 ; N ccedilla ; B 25 -218 430 473 ; -C -1 ; WX 500 ; N ydieresis ; B 16 -205 480 667 ; -C -1 ; WX 500 ; N atilde ; B 25 -14 488 674 ; -C -1 ; WX 278 ; N icircumflex ; B -36 0 301 704 ; -C -1 ; WX 300 ; N threesuperior ; B 3 268 297 688 ; -C -1 ; WX 444 ; N ecircumflex ; B 25 -14 426 704 ; -C -1 ; WX 556 ; N thorn ; B 19 -205 524 676 ; -C -1 ; WX 444 ; N egrave ; B 25 -14 426 713 ; -C -1 ; WX 300 ; N twosuperior ; B 0 275 300 688 ; -C -1 ; WX 444 ; N eacute ; B 25 -14 426 713 ; -C -1 ; WX 500 ; N otilde ; B 25 -14 476 674 ; -C -1 ; WX 722 ; N Aacute ; B 9 0 689 923 ; -C -1 ; WX 500 ; N ocircumflex ; B 25 -14 476 704 ; -C -1 ; WX 500 ; N yacute ; B 16 -205 480 713 ; -C -1 ; WX 556 ; N udieresis ; B 16 -14 537 667 ; -C -1 ; WX 750 ; N threequarters ; B 23 -12 733 688 ; -C -1 ; WX 500 ; N acircumflex ; B 25 -14 488 704 ; -C -1 ; WX 722 ; N Eth ; B 6 0 690 676 ; -C -1 ; WX 444 ; N edieresis ; B 25 -14 426 667 ; -C -1 ; WX 556 ; N ugrave ; B 16 -14 537 713 ; -C -1 ; WX 1000 ; N trademark ; B 24 271 977 676 ; -C -1 ; WX 500 ; N ograve ; B 25 -14 476 713 ; -C -1 ; WX 389 ; N scaron ; B 25 -14 363 704 ; -C -1 ; WX 389 ; N Idieresis ; B 20 0 370 877 ; -C -1 ; WX 556 ; N uacute ; B 16 -14 537 713 ; -C -1 ; WX 500 ; N agrave ; B 25 -14 488 713 ; -C -1 ; WX 556 ; N ntilde ; B 21 0 539 674 ; -C -1 ; WX 500 ; N aring ; B 25 -14 488 740 ; -C -1 ; WX 444 ; N zcaron ; B 21 0 420 704 ; -C -1 ; WX 389 ; N Icircumflex ; B 20 0 370 914 ; -C -1 ; WX 722 ; N Ntilde ; B 16 -18 701 884 ; -C -1 ; WX 556 ; N ucircumflex ; B 16 -14 537 704 ; -C -1 ; WX 667 ; N Ecircumflex ; B 16 0 641 914 ; -C -1 ; WX 389 ; N Iacute ; B 20 0 370 923 ; -C -1 ; WX 722 ; N Ccedilla ; B 49 -218 687 691 ; -C -1 ; WX 778 ; N Odieresis ; B 35 -19 743 877 ; -C -1 ; WX 556 ; N Scaron ; B 35 -19 513 914 ; -C -1 ; WX 667 ; N Edieresis ; B 16 0 641 877 ; -C -1 ; WX 389 ; N Igrave ; B 20 0 370 923 ; -C -1 ; WX 500 ; N adieresis ; B 25 -14 488 667 ; -C -1 ; WX 778 ; N Ograve ; B 35 -19 743 923 ; -C -1 ; WX 667 ; N Egrave ; B 16 0 641 923 ; -C -1 ; WX 722 ; N Ydieresis ; B 15 0 699 877 ; -C -1 ; WX 747 ; N registered ; B 26 -19 721 691 ; -C -1 ; WX 778 ; N Otilde ; B 35 -19 743 884 ; -C -1 ; WX 750 ; N onequarter ; B 28 -12 743 688 ; -C -1 ; WX 722 ; N Ugrave ; B 16 -19 701 923 ; -C -1 ; WX 722 ; N Ucircumflex ; B 16 -19 701 914 ; -C -1 ; WX 611 ; N Thorn ; B 16 0 600 676 ; -C -1 ; WX 570 ; N divide ; B 33 -31 537 537 ; -C -1 ; WX 722 ; N Atilde ; B 9 0 689 884 ; -C -1 ; WX 722 ; N Uacute ; B 16 -19 701 923 ; -C -1 ; WX 778 ; N Ocircumflex ; B 35 -19 743 914 ; -C -1 ; WX 570 ; N logicalnot ; B 33 108 537 399 ; -C -1 ; WX 722 ; N Aring ; B 9 0 689 935 ; -C -1 ; WX 278 ; N idieresis ; B -36 0 301 667 ; -C -1 ; WX 278 ; N iacute ; B 16 0 290 713 ; -C -1 ; WX 500 ; N aacute ; B 25 -14 488 713 ; -C -1 ; WX 570 ; N plusminus ; B 33 0 537 506 ; -C -1 ; WX 570 ; N multiply ; B 48 16 522 490 ; -C -1 ; WX 722 ; N Udieresis ; B 16 -19 701 877 ; -C -1 ; WX 570 ; N minus ; B 33 209 537 297 ; -C -1 ; WX 300 ; N onesuperior ; B 28 275 273 688 ; -C -1 ; WX 667 ; N Eacute ; B 16 0 641 923 ; -C -1 ; WX 722 ; N Acircumflex ; B 9 0 689 914 ; -C -1 ; WX 747 ; N copyright ; B 26 -19 721 691 ; -C -1 ; WX 722 ; N Agrave ; B 9 0 689 923 ; -C -1 ; WX 500 ; N odieresis ; B 25 -14 476 667 ; -C -1 ; WX 500 ; N oacute ; B 25 -14 476 713 ; -C -1 ; WX 400 ; N degree ; B 57 402 343 688 ; -C -1 ; WX 278 ; N igrave ; B -26 0 255 713 ; -C -1 ; WX 556 ; N mu ; B 33 -206 536 461 ; -C -1 ; WX 778 ; N Oacute ; B 35 -19 743 923 ; -C -1 ; WX 500 ; N eth ; B 25 -14 476 691 ; -C -1 ; WX 722 ; N Adieresis ; B 9 0 689 877 ; -C -1 ; WX 722 ; N Yacute ; B 15 0 699 928 ; -C -1 ; WX 220 ; N brokenbar ; B 66 -19 154 691 ; -C -1 ; WX 750 ; N onehalf ; B -7 -12 775 688 ; -EndCharMetrics -StartKernData -StartKernPairs 283 - -KPX A y -74 -KPX A w -90 -KPX A v -100 -KPX A u -50 -KPX A quoteright -74 -KPX A quotedblright 0 -KPX A p -25 -KPX A Y -100 -KPX A W -130 -KPX A V -145 -KPX A U -50 -KPX A T -95 -KPX A Q -45 -KPX A O -45 -KPX A G -55 -KPX A C -55 - -KPX B period 0 -KPX B comma 0 -KPX B U -10 -KPX B A -30 - -KPX D period -20 -KPX D comma 0 -KPX D Y -40 -KPX D W -40 -KPX D V -40 -KPX D A -35 - -KPX F r 0 -KPX F period -110 -KPX F o -25 -KPX F i 0 -KPX F e -25 -KPX F comma -92 -KPX F a -25 -KPX F A -90 - -KPX G period 0 -KPX G comma 0 - -KPX J u -15 -KPX J period -20 -KPX J o -15 -KPX J e -15 -KPX J comma 0 -KPX J a -15 -KPX J A -30 - -KPX K y -45 -KPX K u -15 -KPX K o -25 -KPX K e -25 -KPX K O -30 - -KPX L y -55 -KPX L quoteright -110 -KPX L quotedblright -20 -KPX L Y -92 -KPX L W -92 -KPX L V -92 -KPX L T -92 - -KPX N period 0 -KPX N comma 0 -KPX N A -20 - -KPX O period 0 -KPX O comma 0 -KPX O Y -50 -KPX O X -40 -KPX O W -50 -KPX O V -50 -KPX O T -40 -KPX O A -40 - -KPX P period -110 -KPX P o -20 -KPX P e -20 -KPX P comma -92 -KPX P a -10 -KPX P A -74 - -KPX Q period -20 -KPX Q comma 0 -KPX Q U -10 - -KPX R Y -35 -KPX R W -35 -KPX R V -55 -KPX R U -30 -KPX R T -40 -KPX R O -30 - -KPX S period 0 -KPX S comma 0 - -KPX T y -74 -KPX T w -74 -KPX T u -92 -KPX T semicolon -74 -KPX T r -74 -KPX T period -90 -KPX T o -92 -KPX T i -18 -KPX T hyphen -92 -KPX T h 0 -KPX T e -92 -KPX T comma -74 -KPX T colon -74 -KPX T a -92 -KPX T O -18 -KPX T A -90 - -KPX U period -50 -KPX U comma -50 -KPX U A -60 - -KPX V u -92 -KPX V semicolon -92 -KPX V period -145 -KPX V o -100 -KPX V i -37 -KPX V hyphen -74 -KPX V e -100 -KPX V comma -129 -KPX V colon -92 -KPX V a -92 -KPX V O -45 -KPX V G -30 -KPX V A -135 - -KPX W y -60 -KPX W u -50 -KPX W semicolon -55 -KPX W period -92 -KPX W o -75 -KPX W i -18 -KPX W hyphen -37 -KPX W h 0 -KPX W e -65 -KPX W comma -92 -KPX W colon -55 -KPX W a -65 -KPX W O -10 -KPX W A -120 - -KPX Y u -92 -KPX Y semicolon -92 -KPX Y period -92 -KPX Y o -111 -KPX Y i -37 -KPX Y hyphen -92 -KPX Y e -111 -KPX Y comma -92 -KPX Y colon -92 -KPX Y a -85 -KPX Y O -35 -KPX Y A -110 - -KPX a y 0 -KPX a w 0 -KPX a v -25 -KPX a t 0 -KPX a p 0 -KPX a g 0 -KPX a b 0 - -KPX b y 0 -KPX b v -15 -KPX b u -20 -KPX b period -40 -KPX b l 0 -KPX b comma 0 -KPX b b -10 - -KPX c y 0 -KPX c period 0 -KPX c l 0 -KPX c k 0 -KPX c h 0 -KPX c comma 0 - -KPX colon space 0 - -KPX comma space 0 -KPX comma quoteright -55 -KPX comma quotedblright -45 - -KPX d y 0 -KPX d w -15 -KPX d v 0 -KPX d period 0 -KPX d d 0 -KPX d comma 0 - -KPX e y 0 -KPX e x 0 -KPX e w 0 -KPX e v -15 -KPX e period 0 -KPX e p 0 -KPX e g 0 -KPX e comma 0 -KPX e b 0 - -KPX f quoteright 55 -KPX f quotedblright 50 -KPX f period -15 -KPX f o -25 -KPX f l 0 -KPX f i -25 -KPX f f 0 -KPX f e 0 -KPX f dotlessi -35 -KPX f comma -15 -KPX f a 0 - -KPX g y 0 -KPX g r 0 -KPX g period -15 -KPX g o 0 -KPX g i 0 -KPX g g 0 -KPX g e 0 -KPX g comma 0 -KPX g a 0 - -KPX h y -15 - -KPX i v -10 - -KPX k y -15 -KPX k o -15 -KPX k e -10 - -KPX l y 0 -KPX l w 0 - -KPX m y 0 -KPX m u 0 - -KPX n y 0 -KPX n v -40 -KPX n u 0 - -KPX o y 0 -KPX o x 0 -KPX o w -10 -KPX o v -10 -KPX o g 0 - -KPX p y 0 - -KPX period quoteright -55 -KPX period quotedblright -55 - -KPX quotedblleft quoteleft 0 -KPX quotedblleft A -10 - -KPX quotedblright space 0 - -KPX quoteleft quoteleft -63 -KPX quoteleft A -10 - -KPX quoteright v -20 -KPX quoteright t 0 -KPX quoteright space -74 -KPX quoteright s -37 -KPX quoteright r -20 -KPX quoteright quoteright -63 -KPX quoteright quotedblright 0 -KPX quoteright l 0 -KPX quoteright d -20 - -KPX r y 0 -KPX r v -10 -KPX r u 0 -KPX r t 0 -KPX r s 0 -KPX r r 0 -KPX r q -18 -KPX r period -100 -KPX r p -10 -KPX r o -18 -KPX r n -15 -KPX r m 0 -KPX r l 0 -KPX r k 0 -KPX r i 0 -KPX r hyphen -37 -KPX r g -10 -KPX r e -18 -KPX r d 0 -KPX r comma -92 -KPX r c -18 -KPX r a 0 - -KPX s w 0 - -KPX space quoteleft 0 -KPX space quotedblleft 0 -KPX space Y -55 -KPX space W -30 -KPX space V -45 -KPX space T -30 -KPX space A -55 - -KPX v period -70 -KPX v o -10 -KPX v e -10 -KPX v comma -55 -KPX v a -10 - -KPX w period -70 -KPX w o -10 -KPX w h 0 -KPX w e 0 -KPX w comma -55 -KPX w a 0 - -KPX x e 0 - -KPX y period -70 -KPX y o -25 -KPX y e -10 -KPX y comma -55 -KPX y a 0 - -KPX z o 0 -KPX z e 0 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 188 210 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 188 210 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 188 210 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 188 210 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 180 195 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 188 210 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 208 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 174 210 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 174 210 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 174 210 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 174 210 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 28 210 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 28 210 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 28 210 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 28 210 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 195 210 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 223 210 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 223 210 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 223 210 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 223 210 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 223 210 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 112 210 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 222 210 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 222 210 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 222 210 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 222 210 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 210 215 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 215 210 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 167 210 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 77 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 77 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 77 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 77 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 77 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 77 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 69 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 62 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 62 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 62 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 62 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -34 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -34 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -34 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -34 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 112 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 84 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 84 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 84 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 84 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 84 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 105 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 105 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 105 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 105 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 84 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 84 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 56 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Times-BoldItalic.afm b/config/psfonts/Times-BoldItalic.afm deleted file mode 100644 index 25ab54ea..00000000 --- a/config/psfonts/Times-BoldItalic.afm +++ /dev/null @@ -1,648 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved. -Comment Creation Date: Tue Mar 20 13:14:55 1990 -Comment UniqueID 28425 -Comment VMusage 32721 39613 -FontName Times-BoldItalic -FullName Times Bold Italic -FamilyName Times -Weight Bold -ItalicAngle -15 -IsFixedPitch false -FontBBox -200 -218 996 921 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.009 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved.Times is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 669 -XHeight 462 -Ascender 699 -Descender -205 -StartCharMetrics 228 -C 32 ; WX 250 ; N space ; B 0 0 0 0 ; -C 33 ; WX 389 ; N exclam ; B 67 -13 370 684 ; -C 34 ; WX 555 ; N quotedbl ; B 136 398 536 685 ; -C 35 ; WX 500 ; N numbersign ; B -33 0 533 700 ; -C 36 ; WX 500 ; N dollar ; B -20 -100 497 733 ; -C 37 ; WX 833 ; N percent ; B 39 -10 793 692 ; -C 38 ; WX 778 ; N ampersand ; B 5 -19 699 682 ; -C 39 ; WX 333 ; N quoteright ; B 98 369 302 685 ; -C 40 ; WX 333 ; N parenleft ; B 28 -179 344 685 ; -C 41 ; WX 333 ; N parenright ; B -44 -179 271 685 ; -C 42 ; WX 500 ; N asterisk ; B 65 249 456 685 ; -C 43 ; WX 570 ; N plus ; B 33 0 537 506 ; -C 44 ; WX 250 ; N comma ; B -60 -182 144 134 ; -C 45 ; WX 333 ; N hyphen ; B 2 166 271 282 ; -C 46 ; WX 250 ; N period ; B -9 -13 139 135 ; -C 47 ; WX 278 ; N slash ; B -64 -18 342 685 ; -C 48 ; WX 500 ; N zero ; B 17 -14 477 683 ; -C 49 ; WX 500 ; N one ; B 5 0 419 683 ; -C 50 ; WX 500 ; N two ; B -27 0 446 683 ; -C 51 ; WX 500 ; N three ; B -15 -13 450 683 ; -C 52 ; WX 500 ; N four ; B -15 0 503 683 ; -C 53 ; WX 500 ; N five ; B -11 -13 487 669 ; -C 54 ; WX 500 ; N six ; B 23 -15 509 679 ; -C 55 ; WX 500 ; N seven ; B 52 0 525 669 ; -C 56 ; WX 500 ; N eight ; B 3 -13 476 683 ; -C 57 ; WX 500 ; N nine ; B -12 -10 475 683 ; -C 58 ; WX 333 ; N colon ; B 23 -13 264 459 ; -C 59 ; WX 333 ; N semicolon ; B -25 -183 264 459 ; -C 60 ; WX 570 ; N less ; B 31 -8 539 514 ; -C 61 ; WX 570 ; N equal ; B 33 107 537 399 ; -C 62 ; WX 570 ; N greater ; B 31 -8 539 514 ; -C 63 ; WX 500 ; N question ; B 79 -13 470 684 ; -C 64 ; WX 832 ; N at ; B 63 -18 770 685 ; -C 65 ; WX 667 ; N A ; B -67 0 593 683 ; -C 66 ; WX 667 ; N B ; B -24 0 624 669 ; -C 67 ; WX 667 ; N C ; B 32 -18 677 685 ; -C 68 ; WX 722 ; N D ; B -46 0 685 669 ; -C 69 ; WX 667 ; N E ; B -27 0 653 669 ; -C 70 ; WX 667 ; N F ; B -13 0 660 669 ; -C 71 ; WX 722 ; N G ; B 21 -18 706 685 ; -C 72 ; WX 778 ; N H ; B -24 0 799 669 ; -C 73 ; WX 389 ; N I ; B -32 0 406 669 ; -C 74 ; WX 500 ; N J ; B -46 -99 524 669 ; -C 75 ; WX 667 ; N K ; B -21 0 702 669 ; -C 76 ; WX 611 ; N L ; B -22 0 590 669 ; -C 77 ; WX 889 ; N M ; B -29 -12 917 669 ; -C 78 ; WX 722 ; N N ; B -27 -15 748 669 ; -C 79 ; WX 722 ; N O ; B 27 -18 691 685 ; -C 80 ; WX 611 ; N P ; B -27 0 613 669 ; -C 81 ; WX 722 ; N Q ; B 27 -208 691 685 ; -C 82 ; WX 667 ; N R ; B -29 0 623 669 ; -C 83 ; WX 556 ; N S ; B 2 -18 526 685 ; -C 84 ; WX 611 ; N T ; B 50 0 650 669 ; -C 85 ; WX 722 ; N U ; B 67 -18 744 669 ; -C 86 ; WX 667 ; N V ; B 65 -18 715 669 ; -C 87 ; WX 889 ; N W ; B 65 -18 940 669 ; -C 88 ; WX 667 ; N X ; B -24 0 694 669 ; -C 89 ; WX 611 ; N Y ; B 73 0 659 669 ; -C 90 ; WX 611 ; N Z ; B -11 0 590 669 ; -C 91 ; WX 333 ; N bracketleft ; B -37 -159 362 674 ; -C 92 ; WX 278 ; N backslash ; B -1 -18 279 685 ; -C 93 ; WX 333 ; N bracketright ; B -56 -157 343 674 ; -C 94 ; WX 570 ; N asciicircum ; B 67 304 503 669 ; -C 95 ; WX 500 ; N underscore ; B 0 -125 500 -75 ; -C 96 ; WX 333 ; N quoteleft ; B 128 369 332 685 ; -C 97 ; WX 500 ; N a ; B -21 -14 455 462 ; -C 98 ; WX 500 ; N b ; B -14 -13 444 699 ; -C 99 ; WX 444 ; N c ; B -5 -13 392 462 ; -C 100 ; WX 500 ; N d ; B -21 -13 517 699 ; -C 101 ; WX 444 ; N e ; B 5 -13 398 462 ; -C 102 ; WX 333 ; N f ; B -169 -205 446 698 ; L i fi ; L l fl ; -C 103 ; WX 500 ; N g ; B -52 -203 478 462 ; -C 104 ; WX 556 ; N h ; B -13 -9 498 699 ; -C 105 ; WX 278 ; N i ; B 2 -9 263 684 ; -C 106 ; WX 278 ; N j ; B -189 -207 279 684 ; -C 107 ; WX 500 ; N k ; B -23 -8 483 699 ; -C 108 ; WX 278 ; N l ; B 2 -9 290 699 ; -C 109 ; WX 778 ; N m ; B -14 -9 722 462 ; -C 110 ; WX 556 ; N n ; B -6 -9 493 462 ; -C 111 ; WX 500 ; N o ; B -3 -13 441 462 ; -C 112 ; WX 500 ; N p ; B -120 -205 446 462 ; -C 113 ; WX 500 ; N q ; B 1 -205 471 462 ; -C 114 ; WX 389 ; N r ; B -21 0 389 462 ; -C 115 ; WX 389 ; N s ; B -19 -13 333 462 ; -C 116 ; WX 278 ; N t ; B -11 -9 281 594 ; -C 117 ; WX 556 ; N u ; B 15 -9 492 462 ; -C 118 ; WX 444 ; N v ; B 16 -13 401 462 ; -C 119 ; WX 667 ; N w ; B 16 -13 614 462 ; -C 120 ; WX 500 ; N x ; B -46 -13 469 462 ; -C 121 ; WX 444 ; N y ; B -94 -205 392 462 ; -C 122 ; WX 389 ; N z ; B -43 -78 368 449 ; -C 123 ; WX 348 ; N braceleft ; B 5 -187 436 686 ; -C 124 ; WX 220 ; N bar ; B 66 -18 154 685 ; -C 125 ; WX 348 ; N braceright ; B -129 -187 302 686 ; -C 126 ; WX 570 ; N asciitilde ; B 54 173 516 333 ; -C 161 ; WX 389 ; N exclamdown ; B 19 -205 322 492 ; -C 162 ; WX 500 ; N cent ; B 42 -143 439 576 ; -C 163 ; WX 500 ; N sterling ; B -32 -12 510 683 ; -C 164 ; WX 167 ; N fraction ; B -169 -14 324 683 ; -C 165 ; WX 500 ; N yen ; B 33 0 628 669 ; -C 166 ; WX 500 ; N florin ; B -87 -156 537 707 ; -C 167 ; WX 500 ; N section ; B 36 -143 459 685 ; -C 168 ; WX 500 ; N currency ; B -26 34 526 586 ; -C 169 ; WX 278 ; N quotesingle ; B 128 398 268 685 ; -C 170 ; WX 500 ; N quotedblleft ; B 53 369 513 685 ; -C 171 ; WX 500 ; N guillemotleft ; B 12 32 468 415 ; -C 172 ; WX 333 ; N guilsinglleft ; B 32 32 303 415 ; -C 173 ; WX 333 ; N guilsinglright ; B 10 32 281 415 ; -C 174 ; WX 556 ; N fi ; B -188 -205 514 703 ; -C 175 ; WX 556 ; N fl ; B -186 -205 553 704 ; -C 177 ; WX 500 ; N endash ; B -40 178 477 269 ; -C 178 ; WX 500 ; N dagger ; B 91 -145 494 685 ; -C 179 ; WX 500 ; N daggerdbl ; B 10 -139 493 685 ; -C 180 ; WX 250 ; N periodcentered ; B 51 257 199 405 ; -C 182 ; WX 500 ; N paragraph ; B -57 -193 562 669 ; -C 183 ; WX 350 ; N bullet ; B 0 175 350 525 ; -C 184 ; WX 333 ; N quotesinglbase ; B -5 -182 199 134 ; -C 185 ; WX 500 ; N quotedblbase ; B -57 -182 403 134 ; -C 186 ; WX 500 ; N quotedblright ; B 53 369 513 685 ; -C 187 ; WX 500 ; N guillemotright ; B 12 32 468 415 ; -C 188 ; WX 1000 ; N ellipsis ; B 40 -13 852 135 ; -C 189 ; WX 1000 ; N perthousand ; B 7 -29 996 706 ; -C 191 ; WX 500 ; N questiondown ; B 30 -205 421 492 ; -C 193 ; WX 333 ; N grave ; B 85 516 297 697 ; -C 194 ; WX 333 ; N acute ; B 139 516 379 697 ; -C 195 ; WX 333 ; N circumflex ; B 40 516 367 690 ; -C 196 ; WX 333 ; N tilde ; B 48 536 407 655 ; -C 197 ; WX 333 ; N macron ; B 51 553 393 623 ; -C 198 ; WX 333 ; N breve ; B 71 516 387 678 ; -C 199 ; WX 333 ; N dotaccent ; B 163 525 293 655 ; -C 200 ; WX 333 ; N dieresis ; B 55 525 397 655 ; -C 202 ; WX 333 ; N ring ; B 127 516 340 729 ; -C 203 ; WX 333 ; N cedilla ; B -80 -218 156 5 ; -C 205 ; WX 333 ; N hungarumlaut ; B 69 516 498 697 ; -C 206 ; WX 333 ; N ogonek ; B -40 -173 189 44 ; -C 207 ; WX 333 ; N caron ; B 79 516 411 690 ; -C 208 ; WX 1000 ; N emdash ; B -40 178 977 269 ; -C 225 ; WX 944 ; N AE ; B -64 0 918 669 ; -C 227 ; WX 266 ; N ordfeminine ; B 16 399 330 685 ; -C 232 ; WX 611 ; N Lslash ; B -22 0 590 669 ; -C 233 ; WX 722 ; N Oslash ; B 27 -125 691 764 ; -C 234 ; WX 944 ; N OE ; B 23 -8 946 677 ; -C 235 ; WX 300 ; N ordmasculine ; B 56 400 347 685 ; -C 241 ; WX 722 ; N ae ; B -5 -13 673 462 ; -C 245 ; WX 278 ; N dotlessi ; B 2 -9 238 462 ; -C 248 ; WX 278 ; N lslash ; B -13 -9 301 699 ; -C 249 ; WX 500 ; N oslash ; B -3 -119 441 560 ; -C 250 ; WX 722 ; N oe ; B 6 -13 674 462 ; -C 251 ; WX 500 ; N germandbls ; B -200 -200 473 705 ; -C -1 ; WX 611 ; N Zcaron ; B -11 0 590 897 ; -C -1 ; WX 444 ; N ccedilla ; B -24 -218 392 462 ; -C -1 ; WX 444 ; N ydieresis ; B -94 -205 438 655 ; -C -1 ; WX 500 ; N atilde ; B -21 -14 491 655 ; -C -1 ; WX 278 ; N icircumflex ; B -2 -9 325 690 ; -C -1 ; WX 300 ; N threesuperior ; B 17 265 321 683 ; -C -1 ; WX 444 ; N ecircumflex ; B 5 -13 423 690 ; -C -1 ; WX 500 ; N thorn ; B -120 -205 446 699 ; -C -1 ; WX 444 ; N egrave ; B 5 -13 398 697 ; -C -1 ; WX 300 ; N twosuperior ; B 2 274 313 683 ; -C -1 ; WX 444 ; N eacute ; B 5 -13 435 697 ; -C -1 ; WX 500 ; N otilde ; B -3 -13 491 655 ; -C -1 ; WX 667 ; N Aacute ; B -67 0 593 904 ; -C -1 ; WX 500 ; N ocircumflex ; B -3 -13 451 690 ; -C -1 ; WX 444 ; N yacute ; B -94 -205 435 697 ; -C -1 ; WX 556 ; N udieresis ; B 15 -9 494 655 ; -C -1 ; WX 750 ; N threequarters ; B 7 -14 726 683 ; -C -1 ; WX 500 ; N acircumflex ; B -21 -14 455 690 ; -C -1 ; WX 722 ; N Eth ; B -31 0 700 669 ; -C -1 ; WX 444 ; N edieresis ; B 5 -13 443 655 ; -C -1 ; WX 556 ; N ugrave ; B 15 -9 492 697 ; -C -1 ; WX 1000 ; N trademark ; B 32 263 968 669 ; -C -1 ; WX 500 ; N ograve ; B -3 -13 441 697 ; -C -1 ; WX 389 ; N scaron ; B -19 -13 439 690 ; -C -1 ; WX 389 ; N Idieresis ; B -32 0 445 862 ; -C -1 ; WX 556 ; N uacute ; B 15 -9 492 697 ; -C -1 ; WX 500 ; N agrave ; B -21 -14 455 697 ; -C -1 ; WX 556 ; N ntilde ; B -6 -9 504 655 ; -C -1 ; WX 500 ; N aring ; B -21 -14 455 729 ; -C -1 ; WX 389 ; N zcaron ; B -43 -78 424 690 ; -C -1 ; WX 389 ; N Icircumflex ; B -32 0 420 897 ; -C -1 ; WX 722 ; N Ntilde ; B -27 -15 748 862 ; -C -1 ; WX 556 ; N ucircumflex ; B 15 -9 492 690 ; -C -1 ; WX 667 ; N Ecircumflex ; B -27 0 653 897 ; -C -1 ; WX 389 ; N Iacute ; B -32 0 412 904 ; -C -1 ; WX 667 ; N Ccedilla ; B 32 -218 677 685 ; -C -1 ; WX 722 ; N Odieresis ; B 27 -18 691 862 ; -C -1 ; WX 556 ; N Scaron ; B 2 -18 526 897 ; -C -1 ; WX 667 ; N Edieresis ; B -27 0 653 862 ; -C -1 ; WX 389 ; N Igrave ; B -32 0 406 904 ; -C -1 ; WX 500 ; N adieresis ; B -21 -14 471 655 ; -C -1 ; WX 722 ; N Ograve ; B 27 -18 691 904 ; -C -1 ; WX 667 ; N Egrave ; B -27 0 653 904 ; -C -1 ; WX 611 ; N Ydieresis ; B 73 0 659 862 ; -C -1 ; WX 747 ; N registered ; B 30 -18 718 685 ; -C -1 ; WX 722 ; N Otilde ; B 27 -18 691 862 ; -C -1 ; WX 750 ; N onequarter ; B 7 -14 721 683 ; -C -1 ; WX 722 ; N Ugrave ; B 67 -18 744 904 ; -C -1 ; WX 722 ; N Ucircumflex ; B 67 -18 744 897 ; -C -1 ; WX 611 ; N Thorn ; B -27 0 573 669 ; -C -1 ; WX 570 ; N divide ; B 33 -29 537 535 ; -C -1 ; WX 667 ; N Atilde ; B -67 0 593 862 ; -C -1 ; WX 722 ; N Uacute ; B 67 -18 744 904 ; -C -1 ; WX 722 ; N Ocircumflex ; B 27 -18 691 897 ; -C -1 ; WX 606 ; N logicalnot ; B 51 108 555 399 ; -C -1 ; WX 667 ; N Aring ; B -67 0 593 921 ; -C -1 ; WX 278 ; N idieresis ; B 2 -9 360 655 ; -C -1 ; WX 278 ; N iacute ; B 2 -9 352 697 ; -C -1 ; WX 500 ; N aacute ; B -21 -14 463 697 ; -C -1 ; WX 570 ; N plusminus ; B 33 0 537 506 ; -C -1 ; WX 570 ; N multiply ; B 48 16 522 490 ; -C -1 ; WX 722 ; N Udieresis ; B 67 -18 744 862 ; -C -1 ; WX 606 ; N minus ; B 51 209 555 297 ; -C -1 ; WX 300 ; N onesuperior ; B 30 274 301 683 ; -C -1 ; WX 667 ; N Eacute ; B -27 0 653 904 ; -C -1 ; WX 667 ; N Acircumflex ; B -67 0 593 897 ; -C -1 ; WX 747 ; N copyright ; B 30 -18 718 685 ; -C -1 ; WX 667 ; N Agrave ; B -67 0 593 904 ; -C -1 ; WX 500 ; N odieresis ; B -3 -13 466 655 ; -C -1 ; WX 500 ; N oacute ; B -3 -13 463 697 ; -C -1 ; WX 400 ; N degree ; B 83 397 369 683 ; -C -1 ; WX 278 ; N igrave ; B 2 -9 260 697 ; -C -1 ; WX 576 ; N mu ; B -60 -207 516 449 ; -C -1 ; WX 722 ; N Oacute ; B 27 -18 691 904 ; -C -1 ; WX 500 ; N eth ; B -3 -13 454 699 ; -C -1 ; WX 667 ; N Adieresis ; B -67 0 593 862 ; -C -1 ; WX 611 ; N Yacute ; B 73 0 659 904 ; -C -1 ; WX 220 ; N brokenbar ; B 66 -18 154 685 ; -C -1 ; WX 750 ; N onehalf ; B -9 -14 723 683 ; -EndCharMetrics -StartKernData -StartKernPairs 283 - -KPX A y -74 -KPX A w -74 -KPX A v -74 -KPX A u -30 -KPX A quoteright -74 -KPX A quotedblright 0 -KPX A p 0 -KPX A Y -70 -KPX A W -100 -KPX A V -95 -KPX A U -50 -KPX A T -55 -KPX A Q -55 -KPX A O -50 -KPX A G -60 -KPX A C -65 - -KPX B period 0 -KPX B comma 0 -KPX B U -10 -KPX B A -25 - -KPX D period 0 -KPX D comma 0 -KPX D Y -50 -KPX D W -40 -KPX D V -50 -KPX D A -25 - -KPX F r -50 -KPX F period -129 -KPX F o -70 -KPX F i -40 -KPX F e -100 -KPX F comma -129 -KPX F a -95 -KPX F A -100 - -KPX G period 0 -KPX G comma 0 - -KPX J u -40 -KPX J period -10 -KPX J o -40 -KPX J e -40 -KPX J comma -10 -KPX J a -40 -KPX J A -25 - -KPX K y -20 -KPX K u -20 -KPX K o -25 -KPX K e -25 -KPX K O -30 - -KPX L y -37 -KPX L quoteright -55 -KPX L quotedblright 0 -KPX L Y -37 -KPX L W -37 -KPX L V -37 -KPX L T -18 - -KPX N period 0 -KPX N comma 0 -KPX N A -30 - -KPX O period 0 -KPX O comma 0 -KPX O Y -50 -KPX O X -40 -KPX O W -50 -KPX O V -50 -KPX O T -40 -KPX O A -40 - -KPX P period -129 -KPX P o -55 -KPX P e -50 -KPX P comma -129 -KPX P a -40 -KPX P A -85 - -KPX Q period 0 -KPX Q comma 0 -KPX Q U -10 - -KPX R Y -18 -KPX R W -18 -KPX R V -18 -KPX R U -40 -KPX R T -30 -KPX R O -40 - -KPX S period 0 -KPX S comma 0 - -KPX T y -37 -KPX T w -37 -KPX T u -37 -KPX T semicolon -74 -KPX T r -37 -KPX T period -92 -KPX T o -95 -KPX T i -37 -KPX T hyphen -92 -KPX T h 0 -KPX T e -92 -KPX T comma -92 -KPX T colon -74 -KPX T a -92 -KPX T O -18 -KPX T A -55 - -KPX U period 0 -KPX U comma 0 -KPX U A -45 - -KPX V u -55 -KPX V semicolon -74 -KPX V period -129 -KPX V o -111 -KPX V i -55 -KPX V hyphen -70 -KPX V e -111 -KPX V comma -129 -KPX V colon -74 -KPX V a -111 -KPX V O -30 -KPX V G -10 -KPX V A -85 - -KPX W y -55 -KPX W u -55 -KPX W semicolon -55 -KPX W period -74 -KPX W o -80 -KPX W i -37 -KPX W hyphen -50 -KPX W h 0 -KPX W e -90 -KPX W comma -74 -KPX W colon -55 -KPX W a -85 -KPX W O -15 -KPX W A -74 - -KPX Y u -92 -KPX Y semicolon -92 -KPX Y period -74 -KPX Y o -111 -KPX Y i -55 -KPX Y hyphen -92 -KPX Y e -111 -KPX Y comma -92 -KPX Y colon -92 -KPX Y a -92 -KPX Y O -25 -KPX Y A -74 - -KPX a y 0 -KPX a w 0 -KPX a v 0 -KPX a t 0 -KPX a p 0 -KPX a g 0 -KPX a b 0 - -KPX b y 0 -KPX b v 0 -KPX b u -20 -KPX b period -40 -KPX b l 0 -KPX b comma 0 -KPX b b -10 - -KPX c y 0 -KPX c period 0 -KPX c l 0 -KPX c k -10 -KPX c h -10 -KPX c comma 0 - -KPX colon space 0 - -KPX comma space 0 -KPX comma quoteright -95 -KPX comma quotedblright -95 - -KPX d y 0 -KPX d w 0 -KPX d v 0 -KPX d period 0 -KPX d d 0 -KPX d comma 0 - -KPX e y 0 -KPX e x 0 -KPX e w 0 -KPX e v 0 -KPX e period 0 -KPX e p 0 -KPX e g 0 -KPX e comma 0 -KPX e b -10 - -KPX f quoteright 55 -KPX f quotedblright 0 -KPX f period -10 -KPX f o -10 -KPX f l 0 -KPX f i 0 -KPX f f -18 -KPX f e -10 -KPX f dotlessi -30 -KPX f comma -10 -KPX f a 0 - -KPX g y 0 -KPX g r 0 -KPX g period 0 -KPX g o 0 -KPX g i 0 -KPX g g 0 -KPX g e 0 -KPX g comma 0 -KPX g a 0 - -KPX h y 0 - -KPX i v 0 - -KPX k y 0 -KPX k o -10 -KPX k e -30 - -KPX l y 0 -KPX l w 0 - -KPX m y 0 -KPX m u 0 - -KPX n y 0 -KPX n v -40 -KPX n u 0 - -KPX o y -10 -KPX o x -10 -KPX o w -25 -KPX o v -15 -KPX o g 0 - -KPX p y 0 - -KPX period quoteright -95 -KPX period quotedblright -95 - -KPX quotedblleft quoteleft 0 -KPX quotedblleft A 0 - -KPX quotedblright space 0 - -KPX quoteleft quoteleft -74 -KPX quoteleft A 0 - -KPX quoteright v -15 -KPX quoteright t -37 -KPX quoteright space -74 -KPX quoteright s -74 -KPX quoteright r -15 -KPX quoteright quoteright -74 -KPX quoteright quotedblright 0 -KPX quoteright l 0 -KPX quoteright d -15 - -KPX r y 0 -KPX r v 0 -KPX r u 0 -KPX r t 0 -KPX r s 0 -KPX r r 0 -KPX r q 0 -KPX r period -65 -KPX r p 0 -KPX r o 0 -KPX r n 0 -KPX r m 0 -KPX r l 0 -KPX r k 0 -KPX r i 0 -KPX r hyphen 0 -KPX r g 0 -KPX r e 0 -KPX r d 0 -KPX r comma -65 -KPX r c 0 -KPX r a 0 - -KPX s w 0 - -KPX space quoteleft 0 -KPX space quotedblleft 0 -KPX space Y -70 -KPX space W -70 -KPX space V -70 -KPX space T 0 -KPX space A -37 - -KPX v period -37 -KPX v o -15 -KPX v e -15 -KPX v comma -37 -KPX v a 0 - -KPX w period -37 -KPX w o -15 -KPX w h 0 -KPX w e -10 -KPX w comma -37 -KPX w a -10 - -KPX x e -10 - -KPX y period -37 -KPX y o 0 -KPX y e 0 -KPX y comma -37 -KPX y a 0 - -KPX z o 0 -KPX z e 0 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 172 207 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 187 207 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 167 207 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 172 207 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 157 192 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 167 207 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 167 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 172 207 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 187 207 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 187 207 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 172 207 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 33 207 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 53 207 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 48 207 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 33 207 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 210 207 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 200 207 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 230 207 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 215 207 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 200 207 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 215 207 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 112 207 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 210 207 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 230 207 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 230 207 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 200 207 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 154 207 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 169 207 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 207 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 84 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 84 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 74 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 74 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 84 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 84 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 56 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 56 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 56 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 46 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 46 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -42 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -37 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -37 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 97 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 84 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 84 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 69 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 74 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 84 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 112 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 112 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 97 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 102 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 56 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 41 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 13 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Times-Italic.afm b/config/psfonts/Times-Italic.afm deleted file mode 100644 index 6d7a003b..00000000 --- a/config/psfonts/Times-Italic.afm +++ /dev/null @@ -1,648 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved. -Comment Creation Date: Tue Mar 20 13:14:56 1990 -Comment UniqueID 28427 -Comment VMusage 32912 39804 -FontName Times-Italic -FullName Times Italic -FamilyName Times -Weight Medium -ItalicAngle -15.5 -IsFixedPitch false -FontBBox -169 -217 1010 883 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.007 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved.Times is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 653 -XHeight 441 -Ascender 683 -Descender -205 -StartCharMetrics 228 -C 32 ; WX 250 ; N space ; B 0 0 0 0 ; -C 33 ; WX 333 ; N exclam ; B 39 -11 302 667 ; -C 34 ; WX 420 ; N quotedbl ; B 144 421 432 666 ; -C 35 ; WX 500 ; N numbersign ; B 2 0 540 676 ; -C 36 ; WX 500 ; N dollar ; B 31 -89 497 731 ; -C 37 ; WX 833 ; N percent ; B 79 -13 790 676 ; -C 38 ; WX 778 ; N ampersand ; B 76 -18 723 666 ; -C 39 ; WX 333 ; N quoteright ; B 151 436 290 666 ; -C 40 ; WX 333 ; N parenleft ; B 42 -181 315 669 ; -C 41 ; WX 333 ; N parenright ; B 16 -180 289 669 ; -C 42 ; WX 500 ; N asterisk ; B 128 255 492 666 ; -C 43 ; WX 675 ; N plus ; B 86 0 590 506 ; -C 44 ; WX 250 ; N comma ; B -4 -129 135 101 ; -C 45 ; WX 333 ; N hyphen ; B 49 192 282 255 ; -C 46 ; WX 250 ; N period ; B 27 -11 138 100 ; -C 47 ; WX 278 ; N slash ; B -65 -18 386 666 ; -C 48 ; WX 500 ; N zero ; B 32 -7 497 676 ; -C 49 ; WX 500 ; N one ; B 49 0 409 676 ; -C 50 ; WX 500 ; N two ; B 12 0 452 676 ; -C 51 ; WX 500 ; N three ; B 15 -7 465 676 ; -C 52 ; WX 500 ; N four ; B 1 0 479 676 ; -C 53 ; WX 500 ; N five ; B 15 -7 491 666 ; -C 54 ; WX 500 ; N six ; B 30 -7 521 686 ; -C 55 ; WX 500 ; N seven ; B 75 -8 537 666 ; -C 56 ; WX 500 ; N eight ; B 30 -7 493 676 ; -C 57 ; WX 500 ; N nine ; B 23 -17 492 676 ; -C 58 ; WX 333 ; N colon ; B 50 -11 261 441 ; -C 59 ; WX 333 ; N semicolon ; B 27 -129 261 441 ; -C 60 ; WX 675 ; N less ; B 84 -8 592 514 ; -C 61 ; WX 675 ; N equal ; B 86 120 590 386 ; -C 62 ; WX 675 ; N greater ; B 84 -8 592 514 ; -C 63 ; WX 500 ; N question ; B 132 -12 472 664 ; -C 64 ; WX 920 ; N at ; B 118 -18 806 666 ; -C 65 ; WX 611 ; N A ; B -51 0 564 668 ; -C 66 ; WX 611 ; N B ; B -8 0 588 653 ; -C 67 ; WX 667 ; N C ; B 66 -18 689 666 ; -C 68 ; WX 722 ; N D ; B -8 0 700 653 ; -C 69 ; WX 611 ; N E ; B -1 0 634 653 ; -C 70 ; WX 611 ; N F ; B 8 0 645 653 ; -C 71 ; WX 722 ; N G ; B 52 -18 722 666 ; -C 72 ; WX 722 ; N H ; B -8 0 767 653 ; -C 73 ; WX 333 ; N I ; B -8 0 384 653 ; -C 74 ; WX 444 ; N J ; B -6 -18 491 653 ; -C 75 ; WX 667 ; N K ; B 7 0 722 653 ; -C 76 ; WX 556 ; N L ; B -8 0 559 653 ; -C 77 ; WX 833 ; N M ; B -18 0 873 653 ; -C 78 ; WX 667 ; N N ; B -20 -15 727 653 ; -C 79 ; WX 722 ; N O ; B 60 -18 699 666 ; -C 80 ; WX 611 ; N P ; B 0 0 605 653 ; -C 81 ; WX 722 ; N Q ; B 59 -182 699 666 ; -C 82 ; WX 611 ; N R ; B -13 0 588 653 ; -C 83 ; WX 500 ; N S ; B 17 -18 508 667 ; -C 84 ; WX 556 ; N T ; B 59 0 633 653 ; -C 85 ; WX 722 ; N U ; B 102 -18 765 653 ; -C 86 ; WX 611 ; N V ; B 76 -18 688 653 ; -C 87 ; WX 833 ; N W ; B 71 -18 906 653 ; -C 88 ; WX 611 ; N X ; B -29 0 655 653 ; -C 89 ; WX 556 ; N Y ; B 78 0 633 653 ; -C 90 ; WX 556 ; N Z ; B -6 0 606 653 ; -C 91 ; WX 389 ; N bracketleft ; B 21 -153 391 663 ; -C 92 ; WX 278 ; N backslash ; B -41 -18 319 666 ; -C 93 ; WX 389 ; N bracketright ; B 12 -153 382 663 ; -C 94 ; WX 422 ; N asciicircum ; B 0 301 422 666 ; -C 95 ; WX 500 ; N underscore ; B 0 -125 500 -75 ; -C 96 ; WX 333 ; N quoteleft ; B 171 436 310 666 ; -C 97 ; WX 500 ; N a ; B 17 -11 476 441 ; -C 98 ; WX 500 ; N b ; B 23 -11 473 683 ; -C 99 ; WX 444 ; N c ; B 30 -11 425 441 ; -C 100 ; WX 500 ; N d ; B 15 -13 527 683 ; -C 101 ; WX 444 ; N e ; B 31 -11 412 441 ; -C 102 ; WX 278 ; N f ; B -147 -207 424 678 ; L i fi ; L l fl ; -C 103 ; WX 500 ; N g ; B 8 -206 472 441 ; -C 104 ; WX 500 ; N h ; B 19 -9 478 683 ; -C 105 ; WX 278 ; N i ; B 49 -11 264 654 ; -C 106 ; WX 278 ; N j ; B -124 -207 276 654 ; -C 107 ; WX 444 ; N k ; B 14 -11 461 683 ; -C 108 ; WX 278 ; N l ; B 41 -11 279 683 ; -C 109 ; WX 722 ; N m ; B 12 -9 704 441 ; -C 110 ; WX 500 ; N n ; B 14 -9 474 441 ; -C 111 ; WX 500 ; N o ; B 27 -11 468 441 ; -C 112 ; WX 500 ; N p ; B -75 -205 469 441 ; -C 113 ; WX 500 ; N q ; B 25 -209 483 441 ; -C 114 ; WX 389 ; N r ; B 45 0 412 441 ; -C 115 ; WX 389 ; N s ; B 16 -13 366 442 ; -C 116 ; WX 278 ; N t ; B 37 -11 296 546 ; -C 117 ; WX 500 ; N u ; B 42 -11 475 441 ; -C 118 ; WX 444 ; N v ; B 21 -18 426 441 ; -C 119 ; WX 667 ; N w ; B 16 -18 648 441 ; -C 120 ; WX 444 ; N x ; B -27 -11 447 441 ; -C 121 ; WX 444 ; N y ; B -24 -206 426 441 ; -C 122 ; WX 389 ; N z ; B -2 -81 380 428 ; -C 123 ; WX 400 ; N braceleft ; B 51 -177 407 687 ; -C 124 ; WX 275 ; N bar ; B 105 -18 171 666 ; -C 125 ; WX 400 ; N braceright ; B -7 -177 349 687 ; -C 126 ; WX 541 ; N asciitilde ; B 40 183 502 323 ; -C 161 ; WX 389 ; N exclamdown ; B 59 -205 322 473 ; -C 162 ; WX 500 ; N cent ; B 77 -143 472 560 ; -C 163 ; WX 500 ; N sterling ; B 10 -6 517 670 ; -C 164 ; WX 167 ; N fraction ; B -169 -10 337 676 ; -C 165 ; WX 500 ; N yen ; B 27 0 603 653 ; -C 166 ; WX 500 ; N florin ; B 25 -182 507 682 ; -C 167 ; WX 500 ; N section ; B 53 -162 461 666 ; -C 168 ; WX 500 ; N currency ; B -22 53 522 597 ; -C 169 ; WX 214 ; N quotesingle ; B 132 421 241 666 ; -C 170 ; WX 556 ; N quotedblleft ; B 166 436 514 666 ; -C 171 ; WX 500 ; N guillemotleft ; B 53 37 445 403 ; -C 172 ; WX 333 ; N guilsinglleft ; B 51 37 281 403 ; -C 173 ; WX 333 ; N guilsinglright ; B 52 37 282 403 ; -C 174 ; WX 500 ; N fi ; B -141 -207 481 681 ; -C 175 ; WX 500 ; N fl ; B -141 -204 518 682 ; -C 177 ; WX 500 ; N endash ; B -6 197 505 243 ; -C 178 ; WX 500 ; N dagger ; B 101 -159 488 666 ; -C 179 ; WX 500 ; N daggerdbl ; B 22 -143 491 666 ; -C 180 ; WX 250 ; N periodcentered ; B 70 199 181 310 ; -C 182 ; WX 523 ; N paragraph ; B 55 -123 616 653 ; -C 183 ; WX 350 ; N bullet ; B 40 191 310 461 ; -C 184 ; WX 333 ; N quotesinglbase ; B 44 -129 183 101 ; -C 185 ; WX 556 ; N quotedblbase ; B 57 -129 405 101 ; -C 186 ; WX 556 ; N quotedblright ; B 151 436 499 666 ; -C 187 ; WX 500 ; N guillemotright ; B 55 37 447 403 ; -C 188 ; WX 889 ; N ellipsis ; B 57 -11 762 100 ; -C 189 ; WX 1000 ; N perthousand ; B 25 -19 1010 706 ; -C 191 ; WX 500 ; N questiondown ; B 28 -205 368 471 ; -C 193 ; WX 333 ; N grave ; B 121 492 311 664 ; -C 194 ; WX 333 ; N acute ; B 180 494 403 664 ; -C 195 ; WX 333 ; N circumflex ; B 91 492 385 661 ; -C 196 ; WX 333 ; N tilde ; B 100 517 427 624 ; -C 197 ; WX 333 ; N macron ; B 99 532 411 583 ; -C 198 ; WX 333 ; N breve ; B 117 492 418 650 ; -C 199 ; WX 333 ; N dotaccent ; B 207 508 305 606 ; -C 200 ; WX 333 ; N dieresis ; B 107 508 405 606 ; -C 202 ; WX 333 ; N ring ; B 155 492 355 691 ; -C 203 ; WX 333 ; N cedilla ; B -30 -217 182 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B 93 494 486 664 ; -C 206 ; WX 333 ; N ogonek ; B -20 -169 200 40 ; -C 207 ; WX 333 ; N caron ; B 121 492 426 661 ; -C 208 ; WX 889 ; N emdash ; B -6 197 894 243 ; -C 225 ; WX 889 ; N AE ; B -27 0 911 653 ; -C 227 ; WX 276 ; N ordfeminine ; B 42 406 352 676 ; -C 232 ; WX 556 ; N Lslash ; B -8 0 559 653 ; -C 233 ; WX 722 ; N Oslash ; B 60 -105 699 722 ; -C 234 ; WX 944 ; N OE ; B 49 -8 964 666 ; -C 235 ; WX 310 ; N ordmasculine ; B 67 406 362 676 ; -C 241 ; WX 667 ; N ae ; B 23 -11 640 441 ; -C 245 ; WX 278 ; N dotlessi ; B 49 -11 235 441 ; -C 248 ; WX 278 ; N lslash ; B 37 -11 307 683 ; -C 249 ; WX 500 ; N oslash ; B 28 -135 469 554 ; -C 250 ; WX 667 ; N oe ; B 20 -12 646 441 ; -C 251 ; WX 500 ; N germandbls ; B -168 -207 493 679 ; -C -1 ; WX 556 ; N Zcaron ; B -6 0 606 873 ; -C -1 ; WX 444 ; N ccedilla ; B 26 -217 425 441 ; -C -1 ; WX 444 ; N ydieresis ; B -24 -206 441 606 ; -C -1 ; WX 500 ; N atilde ; B 17 -11 511 624 ; -C -1 ; WX 278 ; N icircumflex ; B 34 -11 328 661 ; -C -1 ; WX 300 ; N threesuperior ; B 43 268 339 676 ; -C -1 ; WX 444 ; N ecircumflex ; B 31 -11 441 661 ; -C -1 ; WX 500 ; N thorn ; B -75 -205 469 683 ; -C -1 ; WX 444 ; N egrave ; B 31 -11 412 664 ; -C -1 ; WX 300 ; N twosuperior ; B 33 271 324 676 ; -C -1 ; WX 444 ; N eacute ; B 31 -11 459 664 ; -C -1 ; WX 500 ; N otilde ; B 27 -11 496 624 ; -C -1 ; WX 611 ; N Aacute ; B -51 0 564 876 ; -C -1 ; WX 500 ; N ocircumflex ; B 27 -11 468 661 ; -C -1 ; WX 444 ; N yacute ; B -24 -206 459 664 ; -C -1 ; WX 500 ; N udieresis ; B 42 -11 479 606 ; -C -1 ; WX 750 ; N threequarters ; B 23 -10 736 676 ; -C -1 ; WX 500 ; N acircumflex ; B 17 -11 476 661 ; -C -1 ; WX 722 ; N Eth ; B -8 0 700 653 ; -C -1 ; WX 444 ; N edieresis ; B 31 -11 451 606 ; -C -1 ; WX 500 ; N ugrave ; B 42 -11 475 664 ; -C -1 ; WX 980 ; N trademark ; B 30 247 957 653 ; -C -1 ; WX 500 ; N ograve ; B 27 -11 468 664 ; -C -1 ; WX 389 ; N scaron ; B 16 -13 454 661 ; -C -1 ; WX 333 ; N Idieresis ; B -8 0 435 818 ; -C -1 ; WX 500 ; N uacute ; B 42 -11 477 664 ; -C -1 ; WX 500 ; N agrave ; B 17 -11 476 664 ; -C -1 ; WX 500 ; N ntilde ; B 14 -9 476 624 ; -C -1 ; WX 500 ; N aring ; B 17 -11 476 691 ; -C -1 ; WX 389 ; N zcaron ; B -2 -81 434 661 ; -C -1 ; WX 333 ; N Icircumflex ; B -8 0 425 873 ; -C -1 ; WX 667 ; N Ntilde ; B -20 -15 727 836 ; -C -1 ; WX 500 ; N ucircumflex ; B 42 -11 475 661 ; -C -1 ; WX 611 ; N Ecircumflex ; B -1 0 634 873 ; -C -1 ; WX 333 ; N Iacute ; B -8 0 413 876 ; -C -1 ; WX 667 ; N Ccedilla ; B 66 -217 689 666 ; -C -1 ; WX 722 ; N Odieresis ; B 60 -18 699 818 ; -C -1 ; WX 500 ; N Scaron ; B 17 -18 520 873 ; -C -1 ; WX 611 ; N Edieresis ; B -1 0 634 818 ; -C -1 ; WX 333 ; N Igrave ; B -8 0 384 876 ; -C -1 ; WX 500 ; N adieresis ; B 17 -11 489 606 ; -C -1 ; WX 722 ; N Ograve ; B 60 -18 699 876 ; -C -1 ; WX 611 ; N Egrave ; B -1 0 634 876 ; -C -1 ; WX 556 ; N Ydieresis ; B 78 0 633 818 ; -C -1 ; WX 760 ; N registered ; B 41 -18 719 666 ; -C -1 ; WX 722 ; N Otilde ; B 60 -18 699 836 ; -C -1 ; WX 750 ; N onequarter ; B 33 -10 736 676 ; -C -1 ; WX 722 ; N Ugrave ; B 102 -18 765 876 ; -C -1 ; WX 722 ; N Ucircumflex ; B 102 -18 765 873 ; -C -1 ; WX 611 ; N Thorn ; B 0 0 569 653 ; -C -1 ; WX 675 ; N divide ; B 86 -11 590 517 ; -C -1 ; WX 611 ; N Atilde ; B -51 0 566 836 ; -C -1 ; WX 722 ; N Uacute ; B 102 -18 765 876 ; -C -1 ; WX 722 ; N Ocircumflex ; B 60 -18 699 873 ; -C -1 ; WX 675 ; N logicalnot ; B 86 108 590 386 ; -C -1 ; WX 611 ; N Aring ; B -51 0 564 883 ; -C -1 ; WX 278 ; N idieresis ; B 49 -11 353 606 ; -C -1 ; WX 278 ; N iacute ; B 49 -11 356 664 ; -C -1 ; WX 500 ; N aacute ; B 17 -11 487 664 ; -C -1 ; WX 675 ; N plusminus ; B 86 0 590 506 ; -C -1 ; WX 675 ; N multiply ; B 93 8 582 497 ; -C -1 ; WX 722 ; N Udieresis ; B 102 -18 765 818 ; -C -1 ; WX 675 ; N minus ; B 86 220 590 286 ; -C -1 ; WX 300 ; N onesuperior ; B 43 271 284 676 ; -C -1 ; WX 611 ; N Eacute ; B -1 0 634 876 ; -C -1 ; WX 611 ; N Acircumflex ; B -51 0 564 873 ; -C -1 ; WX 760 ; N copyright ; B 41 -18 719 666 ; -C -1 ; WX 611 ; N Agrave ; B -51 0 564 876 ; -C -1 ; WX 500 ; N odieresis ; B 27 -11 489 606 ; -C -1 ; WX 500 ; N oacute ; B 27 -11 487 664 ; -C -1 ; WX 400 ; N degree ; B 101 390 387 676 ; -C -1 ; WX 278 ; N igrave ; B 49 -11 284 664 ; -C -1 ; WX 500 ; N mu ; B -30 -209 497 428 ; -C -1 ; WX 722 ; N Oacute ; B 60 -18 699 876 ; -C -1 ; WX 500 ; N eth ; B 27 -11 482 683 ; -C -1 ; WX 611 ; N Adieresis ; B -51 0 564 818 ; -C -1 ; WX 556 ; N Yacute ; B 78 0 633 876 ; -C -1 ; WX 275 ; N brokenbar ; B 105 -18 171 666 ; -C -1 ; WX 750 ; N onehalf ; B 34 -10 749 676 ; -EndCharMetrics -StartKernData -StartKernPairs 283 - -KPX A y -55 -KPX A w -55 -KPX A v -55 -KPX A u -20 -KPX A quoteright -37 -KPX A quotedblright 0 -KPX A p 0 -KPX A Y -55 -KPX A W -95 -KPX A V -105 -KPX A U -50 -KPX A T -37 -KPX A Q -40 -KPX A O -40 -KPX A G -35 -KPX A C -30 - -KPX B period 0 -KPX B comma 0 -KPX B U -10 -KPX B A -25 - -KPX D period 0 -KPX D comma 0 -KPX D Y -40 -KPX D W -40 -KPX D V -40 -KPX D A -35 - -KPX F r -55 -KPX F period -135 -KPX F o -105 -KPX F i -45 -KPX F e -75 -KPX F comma -135 -KPX F a -75 -KPX F A -115 - -KPX G period 0 -KPX G comma 0 - -KPX J u -35 -KPX J period -25 -KPX J o -25 -KPX J e -25 -KPX J comma -25 -KPX J a -35 -KPX J A -40 - -KPX K y -40 -KPX K u -40 -KPX K o -40 -KPX K e -35 -KPX K O -50 - -KPX L y -30 -KPX L quoteright -37 -KPX L quotedblright 0 -KPX L Y -20 -KPX L W -55 -KPX L V -55 -KPX L T -20 - -KPX N period 0 -KPX N comma 0 -KPX N A -27 - -KPX O period 0 -KPX O comma 0 -KPX O Y -50 -KPX O X -40 -KPX O W -50 -KPX O V -50 -KPX O T -40 -KPX O A -55 - -KPX P period -135 -KPX P o -80 -KPX P e -80 -KPX P comma -135 -KPX P a -80 -KPX P A -90 - -KPX Q period 0 -KPX Q comma 0 -KPX Q U -10 - -KPX R Y -18 -KPX R W -18 -KPX R V -18 -KPX R U -40 -KPX R T 0 -KPX R O -40 - -KPX S period 0 -KPX S comma 0 - -KPX T y -74 -KPX T w -74 -KPX T u -55 -KPX T semicolon -65 -KPX T r -55 -KPX T period -74 -KPX T o -92 -KPX T i -55 -KPX T hyphen -74 -KPX T h 0 -KPX T e -92 -KPX T comma -74 -KPX T colon -55 -KPX T a -92 -KPX T O -18 -KPX T A -50 - -KPX U period -25 -KPX U comma -25 -KPX U A -40 - -KPX V u -74 -KPX V semicolon -74 -KPX V period -129 -KPX V o -111 -KPX V i -74 -KPX V hyphen -55 -KPX V e -111 -KPX V comma -129 -KPX V colon -65 -KPX V a -111 -KPX V O -30 -KPX V G 0 -KPX V A -60 - -KPX W y -70 -KPX W u -55 -KPX W semicolon -65 -KPX W period -92 -KPX W o -92 -KPX W i -55 -KPX W hyphen -37 -KPX W h 0 -KPX W e -92 -KPX W comma -92 -KPX W colon -65 -KPX W a -92 -KPX W O -25 -KPX W A -60 - -KPX Y u -92 -KPX Y semicolon -65 -KPX Y period -92 -KPX Y o -92 -KPX Y i -74 -KPX Y hyphen -74 -KPX Y e -92 -KPX Y comma -92 -KPX Y colon -65 -KPX Y a -92 -KPX Y O -15 -KPX Y A -50 - -KPX a y 0 -KPX a w 0 -KPX a v 0 -KPX a t 0 -KPX a p 0 -KPX a g -10 -KPX a b 0 - -KPX b y 0 -KPX b v 0 -KPX b u -20 -KPX b period -40 -KPX b l 0 -KPX b comma 0 -KPX b b 0 - -KPX c y 0 -KPX c period 0 -KPX c l 0 -KPX c k -20 -KPX c h -15 -KPX c comma 0 - -KPX colon space 0 - -KPX comma space 0 -KPX comma quoteright -140 -KPX comma quotedblright -140 - -KPX d y 0 -KPX d w 0 -KPX d v 0 -KPX d period 0 -KPX d d 0 -KPX d comma 0 - -KPX e y -30 -KPX e x -20 -KPX e w -15 -KPX e v -15 -KPX e period -15 -KPX e p 0 -KPX e g -40 -KPX e comma -10 -KPX e b 0 - -KPX f quoteright 92 -KPX f quotedblright 0 -KPX f period -15 -KPX f o 0 -KPX f l 0 -KPX f i -20 -KPX f f -18 -KPX f e 0 -KPX f dotlessi -60 -KPX f comma -10 -KPX f a 0 - -KPX g y 0 -KPX g r 0 -KPX g period -15 -KPX g o 0 -KPX g i 0 -KPX g g -10 -KPX g e -10 -KPX g comma -10 -KPX g a 0 - -KPX h y 0 - -KPX i v 0 - -KPX k y -10 -KPX k o -10 -KPX k e -10 - -KPX l y 0 -KPX l w 0 - -KPX m y 0 -KPX m u 0 - -KPX n y 0 -KPX n v -40 -KPX n u 0 - -KPX o y 0 -KPX o x 0 -KPX o w 0 -KPX o v -10 -KPX o g -10 - -KPX p y 0 - -KPX period quoteright -140 -KPX period quotedblright -140 - -KPX quotedblleft quoteleft 0 -KPX quotedblleft A 0 - -KPX quotedblright space 0 - -KPX quoteleft quoteleft -111 -KPX quoteleft A 0 - -KPX quoteright v -10 -KPX quoteright t -30 -KPX quoteright space -111 -KPX quoteright s -40 -KPX quoteright r -25 -KPX quoteright quoteright -111 -KPX quoteright quotedblright 0 -KPX quoteright l 0 -KPX quoteright d -25 - -KPX r y 0 -KPX r v 0 -KPX r u 0 -KPX r t 0 -KPX r s -10 -KPX r r 0 -KPX r q -37 -KPX r period -111 -KPX r p 0 -KPX r o -45 -KPX r n 0 -KPX r m 0 -KPX r l 0 -KPX r k 0 -KPX r i 0 -KPX r hyphen -20 -KPX r g -37 -KPX r e -37 -KPX r d -37 -KPX r comma -111 -KPX r c -37 -KPX r a -15 - -KPX s w 0 - -KPX space quoteleft 0 -KPX space quotedblleft 0 -KPX space Y -75 -KPX space W -40 -KPX space V -35 -KPX space T -18 -KPX space A -18 - -KPX v period -74 -KPX v o 0 -KPX v e 0 -KPX v comma -74 -KPX v a 0 - -KPX w period -74 -KPX w o 0 -KPX w h 0 -KPX w e 0 -KPX w comma -74 -KPX w a 0 - -KPX x e 0 - -KPX y period -55 -KPX y o 0 -KPX y e 0 -KPX y comma -55 -KPX y a 0 - -KPX z o 0 -KPX z e 0 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 139 212 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 144 212 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 139 212 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 149 212 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 129 192 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 139 212 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 167 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 149 212 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 169 212 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 159 212 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 149 212 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 10 212 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 40 212 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 30 212 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 10 212 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 177 212 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 195 212 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 230 212 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 230 212 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 205 212 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 215 212 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 94 212 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 195 212 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 215 212 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 225 212 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 215 212 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 132 212 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 142 212 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 112 212 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 84 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 84 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 84 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 84 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 84 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 84 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 56 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 56 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 56 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 46 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 56 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -47 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -57 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -52 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 49 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 84 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 74 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 84 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 84 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 69 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 74 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 74 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 74 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 84 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 56 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 36 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 8 0 ; -EndComposites -EndFontMetrics diff --git a/config/psfonts/Times-Roman.afm b/config/psfonts/Times-Roman.afm deleted file mode 100644 index e5092b5c..00000000 --- a/config/psfonts/Times-Roman.afm +++ /dev/null @@ -1,648 +0,0 @@ -StartFontMetrics 2.0 -Comment Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved. -Comment Creation Date: Tue Mar 20 12:15:44 1990 -Comment UniqueID 28416 -Comment VMusage 30487 37379 -FontName Times-Roman -FullName Times Roman -FamilyName Times -Weight Roman -ItalicAngle 0 -IsFixedPitch false -FontBBox -168 -218 1000 898 -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.007 -Notice Copyright (c) 1985, 1987, 1989, 1990 Adobe Systems Incorporated. All Rights Reserved.Times is a trademark of Linotype AG and/or its subsidiaries. -EncodingScheme AdobeStandardEncoding -CapHeight 662 -XHeight 450 -Ascender 683 -Descender -217 -StartCharMetrics 228 -C 32 ; WX 250 ; N space ; B 0 0 0 0 ; -C 33 ; WX 333 ; N exclam ; B 130 -9 238 676 ; -C 34 ; WX 408 ; N quotedbl ; B 77 431 331 676 ; -C 35 ; WX 500 ; N numbersign ; B 5 0 496 662 ; -C 36 ; WX 500 ; N dollar ; B 44 -87 457 727 ; -C 37 ; WX 833 ; N percent ; B 61 -13 772 676 ; -C 38 ; WX 778 ; N ampersand ; B 42 -13 750 676 ; -C 39 ; WX 333 ; N quoteright ; B 79 433 218 676 ; -C 40 ; WX 333 ; N parenleft ; B 48 -177 304 676 ; -C 41 ; WX 333 ; N parenright ; B 29 -177 285 676 ; -C 42 ; WX 500 ; N asterisk ; B 69 265 432 676 ; -C 43 ; WX 564 ; N plus ; B 30 0 534 506 ; -C 44 ; WX 250 ; N comma ; B 56 -141 195 102 ; -C 45 ; WX 333 ; N hyphen ; B 39 194 285 257 ; -C 46 ; WX 250 ; N period ; B 70 -11 181 100 ; -C 47 ; WX 278 ; N slash ; B -9 -14 287 676 ; -C 48 ; WX 500 ; N zero ; B 24 -14 476 676 ; -C 49 ; WX 500 ; N one ; B 111 0 394 676 ; -C 50 ; WX 500 ; N two ; B 30 0 475 676 ; -C 51 ; WX 500 ; N three ; B 43 -14 431 676 ; -C 52 ; WX 500 ; N four ; B 12 0 472 676 ; -C 53 ; WX 500 ; N five ; B 32 -14 438 688 ; -C 54 ; WX 500 ; N six ; B 34 -14 468 684 ; -C 55 ; WX 500 ; N seven ; B 20 -8 449 662 ; -C 56 ; WX 500 ; N eight ; B 56 -14 445 676 ; -C 57 ; WX 500 ; N nine ; B 30 -22 459 676 ; -C 58 ; WX 278 ; N colon ; B 81 -11 192 459 ; -C 59 ; WX 278 ; N semicolon ; B 80 -141 219 459 ; -C 60 ; WX 564 ; N less ; B 28 -8 536 514 ; -C 61 ; WX 564 ; N equal ; B 30 120 534 386 ; -C 62 ; WX 564 ; N greater ; B 28 -8 536 514 ; -C 63 ; WX 444 ; N question ; B 68 -8 414 676 ; -C 64 ; WX 921 ; N at ; B 116 -14 809 676 ; -C 65 ; WX 722 ; N A ; B 15 0 706 674 ; -C 66 ; WX 667 ; N B ; B 17 0 593 662 ; -C 67 ; WX 667 ; N C ; B 28 -14 633 676 ; -C 68 ; WX 722 ; N D ; B 16 0 685 662 ; -C 69 ; WX 611 ; N E ; B 12 0 597 662 ; -C 70 ; WX 556 ; N F ; B 12 0 546 662 ; -C 71 ; WX 722 ; N G ; B 32 -14 709 676 ; -C 72 ; WX 722 ; N H ; B 19 0 702 662 ; -C 73 ; WX 333 ; N I ; B 18 0 315 662 ; -C 74 ; WX 389 ; N J ; B 10 -14 370 662 ; -C 75 ; WX 722 ; N K ; B 34 0 723 662 ; -C 76 ; WX 611 ; N L ; B 12 0 598 662 ; -C 77 ; WX 889 ; N M ; B 12 0 863 662 ; -C 78 ; WX 722 ; N N ; B 12 -11 707 662 ; -C 79 ; WX 722 ; N O ; B 34 -14 688 676 ; -C 80 ; WX 556 ; N P ; B 16 0 542 662 ; -C 81 ; WX 722 ; N Q ; B 34 -178 701 676 ; -C 82 ; WX 667 ; N R ; B 17 0 659 662 ; -C 83 ; WX 556 ; N S ; B 42 -14 491 676 ; -C 84 ; WX 611 ; N T ; B 17 0 593 662 ; -C 85 ; WX 722 ; N U ; B 14 -14 705 662 ; -C 86 ; WX 722 ; N V ; B 16 -11 697 662 ; -C 87 ; WX 944 ; N W ; B 5 -11 932 662 ; -C 88 ; WX 722 ; N X ; B 10 0 704 662 ; -C 89 ; WX 722 ; N Y ; B 22 0 703 662 ; -C 90 ; WX 611 ; N Z ; B 9 0 597 662 ; -C 91 ; WX 333 ; N bracketleft ; B 88 -156 299 662 ; -C 92 ; WX 278 ; N backslash ; B -9 -14 287 676 ; -C 93 ; WX 333 ; N bracketright ; B 34 -156 245 662 ; -C 94 ; WX 469 ; N asciicircum ; B 24 297 446 662 ; -C 95 ; WX 500 ; N underscore ; B 0 -125 500 -75 ; -C 96 ; WX 333 ; N quoteleft ; B 115 433 254 676 ; -C 97 ; WX 444 ; N a ; B 37 -10 442 460 ; -C 98 ; WX 500 ; N b ; B 3 -10 468 683 ; -C 99 ; WX 444 ; N c ; B 25 -10 412 460 ; -C 100 ; WX 500 ; N d ; B 27 -10 491 683 ; -C 101 ; WX 444 ; N e ; B 25 -10 424 460 ; -C 102 ; WX 333 ; N f ; B 20 0 383 683 ; L i fi ; L l fl ; -C 103 ; WX 500 ; N g ; B 28 -218 470 460 ; -C 104 ; WX 500 ; N h ; B 9 0 487 683 ; -C 105 ; WX 278 ; N i ; B 16 0 253 683 ; -C 106 ; WX 278 ; N j ; B -70 -218 194 683 ; -C 107 ; WX 500 ; N k ; B 7 0 505 683 ; -C 108 ; WX 278 ; N l ; B 19 0 257 683 ; -C 109 ; WX 778 ; N m ; B 16 0 775 460 ; -C 110 ; WX 500 ; N n ; B 16 0 485 460 ; -C 111 ; WX 500 ; N o ; B 29 -10 470 460 ; -C 112 ; WX 500 ; N p ; B 5 -217 470 460 ; -C 113 ; WX 500 ; N q ; B 24 -217 488 460 ; -C 114 ; WX 333 ; N r ; B 5 0 335 460 ; -C 115 ; WX 389 ; N s ; B 51 -10 348 460 ; -C 116 ; WX 278 ; N t ; B 13 -10 279 579 ; -C 117 ; WX 500 ; N u ; B 9 -10 479 450 ; -C 118 ; WX 500 ; N v ; B 19 -14 477 450 ; -C 119 ; WX 722 ; N w ; B 21 -14 694 450 ; -C 120 ; WX 500 ; N x ; B 17 0 479 450 ; -C 121 ; WX 500 ; N y ; B 14 -218 475 450 ; -C 122 ; WX 444 ; N z ; B 27 0 418 450 ; -C 123 ; WX 480 ; N braceleft ; B 100 -181 350 680 ; -C 124 ; WX 200 ; N bar ; B 67 -14 133 676 ; -C 125 ; WX 480 ; N braceright ; B 130 -181 380 680 ; -C 126 ; WX 541 ; N asciitilde ; B 40 183 502 323 ; -C 161 ; WX 333 ; N exclamdown ; B 97 -218 205 467 ; -C 162 ; WX 500 ; N cent ; B 53 -138 448 579 ; -C 163 ; WX 500 ; N sterling ; B 12 -8 490 676 ; -C 164 ; WX 167 ; N fraction ; B -168 -14 331 676 ; -C 165 ; WX 500 ; N yen ; B -53 0 512 662 ; -C 166 ; WX 500 ; N florin ; B 7 -189 490 676 ; -C 167 ; WX 500 ; N section ; B 70 -148 426 676 ; -C 168 ; WX 500 ; N currency ; B -22 58 522 602 ; -C 169 ; WX 180 ; N quotesingle ; B 48 431 133 676 ; -C 170 ; WX 444 ; N quotedblleft ; B 43 433 414 676 ; -C 171 ; WX 500 ; N guillemotleft ; B 42 33 456 416 ; -C 172 ; WX 333 ; N guilsinglleft ; B 63 33 285 416 ; -C 173 ; WX 333 ; N guilsinglright ; B 48 33 270 416 ; -C 174 ; WX 556 ; N fi ; B 31 0 521 683 ; -C 175 ; WX 556 ; N fl ; B 32 0 521 683 ; -C 177 ; WX 500 ; N endash ; B 0 201 500 250 ; -C 178 ; WX 500 ; N dagger ; B 59 -149 442 676 ; -C 179 ; WX 500 ; N daggerdbl ; B 58 -153 442 676 ; -C 180 ; WX 250 ; N periodcentered ; B 70 199 181 310 ; -C 182 ; WX 453 ; N paragraph ; B -22 -154 450 662 ; -C 183 ; WX 350 ; N bullet ; B 40 196 310 466 ; -C 184 ; WX 333 ; N quotesinglbase ; B 79 -141 218 102 ; -C 185 ; WX 444 ; N quotedblbase ; B 45 -141 416 102 ; -C 186 ; WX 444 ; N quotedblright ; B 30 433 401 676 ; -C 187 ; WX 500 ; N guillemotright ; B 44 33 458 416 ; -C 188 ; WX 1000 ; N ellipsis ; B 111 -11 888 100 ; -C 189 ; WX 1000 ; N perthousand ; B 7 -19 994 706 ; -C 191 ; WX 444 ; N questiondown ; B 30 -218 376 466 ; -C 193 ; WX 333 ; N grave ; B 19 507 242 678 ; -C 194 ; WX 333 ; N acute ; B 93 507 317 678 ; -C 195 ; WX 333 ; N circumflex ; B 11 507 322 674 ; -C 196 ; WX 333 ; N tilde ; B 1 532 331 638 ; -C 197 ; WX 333 ; N macron ; B 11 547 322 601 ; -C 198 ; WX 333 ; N breve ; B 26 507 307 664 ; -C 199 ; WX 333 ; N dotaccent ; B 118 523 216 623 ; -C 200 ; WX 333 ; N dieresis ; B 18 523 315 623 ; -C 202 ; WX 333 ; N ring ; B 67 512 266 711 ; -C 203 ; WX 333 ; N cedilla ; B 52 -215 261 0 ; -C 205 ; WX 333 ; N hungarumlaut ; B -3 507 377 678 ; -C 206 ; WX 333 ; N ogonek ; B 64 -165 249 0 ; -C 207 ; WX 333 ; N caron ; B 11 507 322 674 ; -C 208 ; WX 1000 ; N emdash ; B 0 201 1000 250 ; -C 225 ; WX 889 ; N AE ; B 0 0 863 662 ; -C 227 ; WX 276 ; N ordfeminine ; B 4 394 270 676 ; -C 232 ; WX 611 ; N Lslash ; B 12 0 598 662 ; -C 233 ; WX 722 ; N Oslash ; B 34 -80 688 734 ; -C 234 ; WX 889 ; N OE ; B 30 -6 885 668 ; -C 235 ; WX 310 ; N ordmasculine ; B 6 394 304 676 ; -C 241 ; WX 667 ; N ae ; B 38 -10 632 460 ; -C 245 ; WX 278 ; N dotlessi ; B 16 0 253 460 ; -C 248 ; WX 278 ; N lslash ; B 19 0 259 683 ; -C 249 ; WX 500 ; N oslash ; B 29 -112 470 551 ; -C 250 ; WX 722 ; N oe ; B 30 -10 690 460 ; -C 251 ; WX 500 ; N germandbls ; B 12 -9 468 683 ; -C -1 ; WX 611 ; N Zcaron ; B 9 0 597 886 ; -C -1 ; WX 444 ; N ccedilla ; B 25 -215 412 460 ; -C -1 ; WX 500 ; N ydieresis ; B 14 -218 475 623 ; -C -1 ; WX 444 ; N atilde ; B 37 -10 442 638 ; -C -1 ; WX 278 ; N icircumflex ; B -16 0 295 674 ; -C -1 ; WX 300 ; N threesuperior ; B 15 262 291 676 ; -C -1 ; WX 444 ; N ecircumflex ; B 25 -10 424 674 ; -C -1 ; WX 500 ; N thorn ; B 5 -217 470 683 ; -C -1 ; WX 444 ; N egrave ; B 25 -10 424 678 ; -C -1 ; WX 300 ; N twosuperior ; B 1 270 296 676 ; -C -1 ; WX 444 ; N eacute ; B 25 -10 424 678 ; -C -1 ; WX 500 ; N otilde ; B 29 -10 470 638 ; -C -1 ; WX 722 ; N Aacute ; B 15 0 706 890 ; -C -1 ; WX 500 ; N ocircumflex ; B 29 -10 470 674 ; -C -1 ; WX 500 ; N yacute ; B 14 -218 475 678 ; -C -1 ; WX 500 ; N udieresis ; B 9 -10 479 623 ; -C -1 ; WX 750 ; N threequarters ; B 15 -14 718 676 ; -C -1 ; WX 444 ; N acircumflex ; B 37 -10 442 674 ; -C -1 ; WX 722 ; N Eth ; B 16 0 685 662 ; -C -1 ; WX 444 ; N edieresis ; B 25 -10 424 623 ; -C -1 ; WX 500 ; N ugrave ; B 9 -10 479 678 ; -C -1 ; WX 980 ; N trademark ; B 30 256 957 662 ; -C -1 ; WX 500 ; N ograve ; B 29 -10 470 678 ; -C -1 ; WX 389 ; N scaron ; B 39 -10 350 674 ; -C -1 ; WX 333 ; N Idieresis ; B 18 0 315 835 ; -C -1 ; WX 500 ; N uacute ; B 9 -10 479 678 ; -C -1 ; WX 444 ; N agrave ; B 37 -10 442 678 ; -C -1 ; WX 500 ; N ntilde ; B 16 0 485 638 ; -C -1 ; WX 444 ; N aring ; B 37 -10 442 711 ; -C -1 ; WX 444 ; N zcaron ; B 27 0 418 674 ; -C -1 ; WX 333 ; N Icircumflex ; B 11 0 322 886 ; -C -1 ; WX 722 ; N Ntilde ; B 12 -11 707 850 ; -C -1 ; WX 500 ; N ucircumflex ; B 9 -10 479 674 ; -C -1 ; WX 611 ; N Ecircumflex ; B 12 0 597 886 ; -C -1 ; WX 333 ; N Iacute ; B 18 0 317 890 ; -C -1 ; WX 667 ; N Ccedilla ; B 28 -215 633 676 ; -C -1 ; WX 722 ; N Odieresis ; B 34 -14 688 835 ; -C -1 ; WX 556 ; N Scaron ; B 42 -14 491 886 ; -C -1 ; WX 611 ; N Edieresis ; B 12 0 597 835 ; -C -1 ; WX 333 ; N Igrave ; B 18 0 315 890 ; -C -1 ; WX 444 ; N adieresis ; B 37 -10 442 623 ; -C -1 ; WX 722 ; N Ograve ; B 34 -14 688 890 ; -C -1 ; WX 611 ; N Egrave ; B 12 0 597 890 ; -C -1 ; WX 722 ; N Ydieresis ; B 22 0 703 835 ; -C -1 ; WX 760 ; N registered ; B 38 -14 722 676 ; -C -1 ; WX 722 ; N Otilde ; B 34 -14 688 850 ; -C -1 ; WX 750 ; N onequarter ; B 37 -14 718 676 ; -C -1 ; WX 722 ; N Ugrave ; B 14 -14 705 890 ; -C -1 ; WX 722 ; N Ucircumflex ; B 14 -14 705 886 ; -C -1 ; WX 556 ; N Thorn ; B 16 0 542 662 ; -C -1 ; WX 564 ; N divide ; B 30 -10 534 516 ; -C -1 ; WX 722 ; N Atilde ; B 15 0 706 850 ; -C -1 ; WX 722 ; N Uacute ; B 14 -14 705 890 ; -C -1 ; WX 722 ; N Ocircumflex ; B 34 -14 688 886 ; -C -1 ; WX 564 ; N logicalnot ; B 30 108 534 386 ; -C -1 ; WX 722 ; N Aring ; B 15 0 706 898 ; -C -1 ; WX 278 ; N idieresis ; B -9 0 288 623 ; -C -1 ; WX 278 ; N iacute ; B 16 0 290 678 ; -C -1 ; WX 444 ; N aacute ; B 37 -10 442 678 ; -C -1 ; WX 564 ; N plusminus ; B 30 0 534 506 ; -C -1 ; WX 564 ; N multiply ; B 38 8 527 497 ; -C -1 ; WX 722 ; N Udieresis ; B 14 -14 705 835 ; -C -1 ; WX 564 ; N minus ; B 30 220 534 286 ; -C -1 ; WX 300 ; N onesuperior ; B 57 270 248 676 ; -C -1 ; WX 611 ; N Eacute ; B 12 0 597 890 ; -C -1 ; WX 722 ; N Acircumflex ; B 15 0 706 886 ; -C -1 ; WX 760 ; N copyright ; B 38 -14 722 676 ; -C -1 ; WX 722 ; N Agrave ; B 15 0 706 890 ; -C -1 ; WX 500 ; N odieresis ; B 29 -10 470 623 ; -C -1 ; WX 500 ; N oacute ; B 29 -10 470 678 ; -C -1 ; WX 400 ; N degree ; B 57 390 343 676 ; -C -1 ; WX 278 ; N igrave ; B -8 0 253 678 ; -C -1 ; WX 500 ; N mu ; B 36 -218 512 450 ; -C -1 ; WX 722 ; N Oacute ; B 34 -14 688 890 ; -C -1 ; WX 500 ; N eth ; B 29 -10 471 686 ; -C -1 ; WX 722 ; N Adieresis ; B 15 0 706 835 ; -C -1 ; WX 722 ; N Yacute ; B 22 0 703 890 ; -C -1 ; WX 200 ; N brokenbar ; B 67 -14 133 676 ; -C -1 ; WX 750 ; N onehalf ; B 31 -14 746 676 ; -EndCharMetrics -StartKernData -StartKernPairs 283 - -KPX A y -92 -KPX A w -92 -KPX A v -74 -KPX A u 0 -KPX A quoteright -111 -KPX A quotedblright 0 -KPX A p 0 -KPX A Y -105 -KPX A W -90 -KPX A V -135 -KPX A U -55 -KPX A T -111 -KPX A Q -55 -KPX A O -55 -KPX A G -40 -KPX A C -40 - -KPX B period 0 -KPX B comma 0 -KPX B U -10 -KPX B A -35 - -KPX D period 0 -KPX D comma 0 -KPX D Y -55 -KPX D W -30 -KPX D V -40 -KPX D A -40 - -KPX F r 0 -KPX F period -80 -KPX F o -15 -KPX F i 0 -KPX F e 0 -KPX F comma -80 -KPX F a -15 -KPX F A -74 - -KPX G period 0 -KPX G comma 0 - -KPX J u 0 -KPX J period 0 -KPX J o 0 -KPX J e 0 -KPX J comma 0 -KPX J a 0 -KPX J A -60 - -KPX K y -25 -KPX K u -15 -KPX K o -35 -KPX K e -25 -KPX K O -30 - -KPX L y -55 -KPX L quoteright -92 -KPX L quotedblright 0 -KPX L Y -100 -KPX L W -74 -KPX L V -100 -KPX L T -92 - -KPX N period 0 -KPX N comma 0 -KPX N A -35 - -KPX O period 0 -KPX O comma 0 -KPX O Y -50 -KPX O X -40 -KPX O W -35 -KPX O V -50 -KPX O T -40 -KPX O A -35 - -KPX P period -111 -KPX P o 0 -KPX P e 0 -KPX P comma -111 -KPX P a -15 -KPX P A -92 - -KPX Q period 0 -KPX Q comma 0 -KPX Q U -10 - -KPX R Y -65 -KPX R W -55 -KPX R V -80 -KPX R U -40 -KPX R T -60 -KPX R O -40 - -KPX S period 0 -KPX S comma 0 - -KPX T y -80 -KPX T w -80 -KPX T u -45 -KPX T semicolon -55 -KPX T r -35 -KPX T period -74 -KPX T o -80 -KPX T i -35 -KPX T hyphen -92 -KPX T h 0 -KPX T e -70 -KPX T comma -74 -KPX T colon -50 -KPX T a -80 -KPX T O -18 -KPX T A -93 - -KPX U period 0 -KPX U comma 0 -KPX U A -40 - -KPX V u -75 -KPX V semicolon -74 -KPX V period -129 -KPX V o -129 -KPX V i -60 -KPX V hyphen -100 -KPX V e -111 -KPX V comma -129 -KPX V colon -74 -KPX V a -111 -KPX V O -40 -KPX V G -15 -KPX V A -135 - -KPX W y -73 -KPX W u -50 -KPX W semicolon -37 -KPX W period -92 -KPX W o -80 -KPX W i -40 -KPX W hyphen -65 -KPX W h 0 -KPX W e -80 -KPX W comma -92 -KPX W colon -37 -KPX W a -80 -KPX W O -10 -KPX W A -120 - -KPX Y u -111 -KPX Y semicolon -92 -KPX Y period -129 -KPX Y o -110 -KPX Y i -55 -KPX Y hyphen -111 -KPX Y e -100 -KPX Y comma -129 -KPX Y colon -92 -KPX Y a -100 -KPX Y O -30 -KPX Y A -120 - -KPX a y 0 -KPX a w -15 -KPX a v -20 -KPX a t 0 -KPX a p 0 -KPX a g 0 -KPX a b 0 - -KPX b y 0 -KPX b v -15 -KPX b u -20 -KPX b period -40 -KPX b l 0 -KPX b comma 0 -KPX b b 0 - -KPX c y -15 -KPX c period 0 -KPX c l 0 -KPX c k 0 -KPX c h 0 -KPX c comma 0 - -KPX colon space 0 - -KPX comma space 0 -KPX comma quoteright -70 -KPX comma quotedblright -70 - -KPX d y 0 -KPX d w 0 -KPX d v 0 -KPX d period 0 -KPX d d 0 -KPX d comma 0 - -KPX e y -15 -KPX e x -15 -KPX e w -25 -KPX e v -25 -KPX e period 0 -KPX e p 0 -KPX e g -15 -KPX e comma 0 -KPX e b 0 - -KPX f quoteright 55 -KPX f quotedblright 0 -KPX f period 0 -KPX f o 0 -KPX f l 0 -KPX f i -20 -KPX f f -25 -KPX f e 0 -KPX f dotlessi -50 -KPX f comma 0 -KPX f a -10 - -KPX g y 0 -KPX g r 0 -KPX g period 0 -KPX g o 0 -KPX g i 0 -KPX g g 0 -KPX g e 0 -KPX g comma 0 -KPX g a -5 - -KPX h y -5 - -KPX i v -25 - -KPX k y -15 -KPX k o -10 -KPX k e -10 - -KPX l y 0 -KPX l w -10 - -KPX m y 0 -KPX m u 0 - -KPX n y -15 -KPX n v -40 -KPX n u 0 - -KPX o y -10 -KPX o x 0 -KPX o w -25 -KPX o v -15 -KPX o g 0 - -KPX p y -10 - -KPX period quoteright -70 -KPX period quotedblright -70 - -KPX quotedblleft quoteleft 0 -KPX quotedblleft A -80 - -KPX quotedblright space 0 - -KPX quoteleft quoteleft -74 -KPX quoteleft A -80 - -KPX quoteright v -50 -KPX quoteright t -18 -KPX quoteright space -74 -KPX quoteright s -55 -KPX quoteright r -50 -KPX quoteright quoteright -74 -KPX quoteright quotedblright 0 -KPX quoteright l -10 -KPX quoteright d -50 - -KPX r y 0 -KPX r v 0 -KPX r u 0 -KPX r t 0 -KPX r s 0 -KPX r r 0 -KPX r q 0 -KPX r period -55 -KPX r p 0 -KPX r o 0 -KPX r n 0 -KPX r m 0 -KPX r l 0 -KPX r k 0 -KPX r i 0 -KPX r hyphen -20 -KPX r g -18 -KPX r e 0 -KPX r d 0 -KPX r comma -40 -KPX r c 0 -KPX r a 0 - -KPX s w 0 - -KPX space quoteleft 0 -KPX space quotedblleft 0 -KPX space Y -90 -KPX space W -30 -KPX space V -50 -KPX space T -18 -KPX space A -55 - -KPX v period -65 -KPX v o -20 -KPX v e -15 -KPX v comma -65 -KPX v a -25 - -KPX w period -65 -KPX w o -10 -KPX w h 0 -KPX w e 0 -KPX w comma -65 -KPX w a -10 - -KPX x e -15 - -KPX y period -65 -KPX y o 0 -KPX y e 0 -KPX y comma -65 -KPX y a 0 - -KPX z o 0 -KPX z e 0 -EndKernPairs -EndKernData -StartComposites 58 -CC Aacute 2 ; PCC A 0 0 ; PCC acute 195 212 ; -CC Acircumflex 2 ; PCC A 0 0 ; PCC circumflex 195 212 ; -CC Adieresis 2 ; PCC A 0 0 ; PCC dieresis 195 212 ; -CC Agrave 2 ; PCC A 0 0 ; PCC grave 195 212 ; -CC Aring 2 ; PCC A 0 0 ; PCC ring 185 187 ; -CC Atilde 2 ; PCC A 0 0 ; PCC tilde 195 212 ; -CC Ccedilla 2 ; PCC C 0 0 ; PCC cedilla 167 0 ; -CC Eacute 2 ; PCC E 0 0 ; PCC acute 139 212 ; -CC Ecircumflex 2 ; PCC E 0 0 ; PCC circumflex 139 212 ; -CC Edieresis 2 ; PCC E 0 0 ; PCC dieresis 139 212 ; -CC Egrave 2 ; PCC E 0 0 ; PCC grave 139 212 ; -CC Iacute 2 ; PCC I 0 0 ; PCC acute 0 212 ; -CC Icircumflex 2 ; PCC I 0 0 ; PCC circumflex 0 212 ; -CC Idieresis 2 ; PCC I 0 0 ; PCC dieresis 0 212 ; -CC Igrave 2 ; PCC I 0 0 ; PCC grave 0 212 ; -CC Ntilde 2 ; PCC N 0 0 ; PCC tilde 195 212 ; -CC Oacute 2 ; PCC O 0 0 ; PCC acute 195 212 ; -CC Ocircumflex 2 ; PCC O 0 0 ; PCC circumflex 195 212 ; -CC Odieresis 2 ; PCC O 0 0 ; PCC dieresis 195 212 ; -CC Ograve 2 ; PCC O 0 0 ; PCC grave 195 212 ; -CC Otilde 2 ; PCC O 0 0 ; PCC tilde 195 212 ; -CC Scaron 2 ; PCC S 0 0 ; PCC caron 112 212 ; -CC Uacute 2 ; PCC U 0 0 ; PCC acute 195 212 ; -CC Ucircumflex 2 ; PCC U 0 0 ; PCC circumflex 195 212 ; -CC Udieresis 2 ; PCC U 0 0 ; PCC dieresis 195 212 ; -CC Ugrave 2 ; PCC U 0 0 ; PCC grave 195 212 ; -CC Yacute 2 ; PCC Y 0 0 ; PCC acute 195 212 ; -CC Ydieresis 2 ; PCC Y 0 0 ; PCC dieresis 195 212 ; -CC Zcaron 2 ; PCC Z 0 0 ; PCC caron 139 212 ; -CC aacute 2 ; PCC a 0 0 ; PCC acute 56 0 ; -CC acircumflex 2 ; PCC a 0 0 ; PCC circumflex 56 0 ; -CC adieresis 2 ; PCC a 0 0 ; PCC dieresis 56 0 ; -CC agrave 2 ; PCC a 0 0 ; PCC grave 56 0 ; -CC aring 2 ; PCC a 0 0 ; PCC ring 56 0 ; -CC atilde 2 ; PCC a 0 0 ; PCC tilde 56 0 ; -CC ccedilla 2 ; PCC c 0 0 ; PCC cedilla 56 0 ; -CC eacute 2 ; PCC e 0 0 ; PCC acute 56 0 ; -CC ecircumflex 2 ; PCC e 0 0 ; PCC circumflex 56 0 ; -CC edieresis 2 ; PCC e 0 0 ; PCC dieresis 56 0 ; -CC egrave 2 ; PCC e 0 0 ; PCC grave 56 0 ; -CC iacute 2 ; PCC dotlessi 0 0 ; PCC acute -27 0 ; -CC icircumflex 2 ; PCC dotlessi 0 0 ; PCC circumflex -27 0 ; -CC idieresis 2 ; PCC dotlessi 0 0 ; PCC dieresis -27 0 ; -CC igrave 2 ; PCC dotlessi 0 0 ; PCC grave -27 0 ; -CC ntilde 2 ; PCC n 0 0 ; PCC tilde 84 0 ; -CC oacute 2 ; PCC o 0 0 ; PCC acute 84 0 ; -CC ocircumflex 2 ; PCC o 0 0 ; PCC circumflex 84 0 ; -CC odieresis 2 ; PCC o 0 0 ; PCC dieresis 84 0 ; -CC ograve 2 ; PCC o 0 0 ; PCC grave 84 0 ; -CC otilde 2 ; PCC o 0 0 ; PCC tilde 84 0 ; -CC scaron 2 ; PCC s 0 0 ; PCC caron 28 0 ; -CC uacute 2 ; PCC u 0 0 ; PCC acute 84 0 ; -CC ucircumflex 2 ; PCC u 0 0 ; PCC circumflex 84 0 ; -CC udieresis 2 ; PCC u 0 0 ; PCC dieresis 84 0 ; -CC ugrave 2 ; PCC u 0 0 ; PCC grave 84 0 ; -CC yacute 2 ; PCC y 0 0 ; PCC acute 84 0 ; -CC ydieresis 2 ; PCC y 0 0 ; PCC dieresis 84 0 ; -CC zcaron 2 ; PCC z 0 0 ; PCC caron 56 0 ; -EndComposites -EndFontMetrics diff --git a/configure.ac b/configure.ac index 95dfc66f..40626e80 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,10 @@ dnl Process this file with autoconf to produce a configure script. dnl Initialize. -AC_PREREQ(2.60) -AC_INIT([pspp],[0.7.2],[bug-gnu-pspp@gnu.org]) +AC_PREREQ(2.63) +AC_INIT([GNU PSPP], [0.7.4], [bug-gnu-pspp@gnu.org], [pspp]) AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_TESTDIR([tests]) AM_INIT_AUTOMAKE dnl Checks for programs. @@ -31,36 +32,59 @@ PSPP_CC_FOR_BUILD PSPP_PERL dnl Internationalization macros. -AC_ARG_ENABLE(nls, [AS_HELP_STRING([--disable-nls], [do not use Native Language Support])]) -if test x"$enable_nls" != x"no" ; then - AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.]) +AC_PROVIDE([AM_PO_SUBDIRS]) # PSPP provides its own po/ support. +AM_GNU_GETTEXT([external], [need-ngettext]) +AM_GNU_GETTEXT_VERSION([0.17]) +if test -n "$LIBINTL"; then + AC_DEFINE([DEPENDS_ON_LIBINTL], [1], + [Define to 1 if libintl is a separate library, not integrated into libc]) fi - dnl Checks for libraries. AC_SYS_LARGEFILE AC_SEARCH_LIBS([sin], [m]) -PSPP_LIBPLOT +AC_SEARCH_LIBS([dcgettext], [intl]) PSPP_LC_PAPER -AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no") AC_ARG_VAR([PSPP_LDFLAGS], [linker flags to be used for linking the pspp binary only]) AC_ARG_VAR([PSPPIRE_LDFLAGS], [linker flags to be used for linking the psppire binary only]) - -AC_ARG_WITH( - gui, - [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])]) - -required_gtk_version=2.12 - -if test x"$with_gui" != x"no" ; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $required_gtk_version,, - [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v$required_gtk_version or later (or use --without-gui)])]) +# Support for Cairo and Pango. +AC_ARG_WITH([cairo], + [AS_HELP_STRING( + [--without-cairo], + [Don't build support for charts (using Cairo and Pango); + implies --without-gui])], + [], [with_cairo=yes]) +AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no]) +if test "$with_cairo" != no; then + PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], + [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS" + AC_DEFINE([HAVE_CAIRO], 1, + [Define to 1 if Cairo and Pango are available.])], + [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])]) + AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH]) + AC_SUBST(XMLLINT) fi -AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no") +# Support for GUI. +AC_ARG_WITH([gui], + [AS_HELP_STRING([--without-gui], + [Don't build the PSPPIRE GUI (using GTK+)])], + [], [with_gui=yes]) +AM_CONDITIONAL([HAVE_GUI], + [test "$with_cairo" != no && test "$with_gui" != "no"]) +if test "$with_cairo" != no && test "$with_gui" != "no"; then + PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12], [], + [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.12 or later (or use --without-gui)])]) + + AC_ARG_VAR([GLIB_GENMARSHAL]) + AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal]) + if test "x$GLIB_GENMARSHAL" = x; then + PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)]) + fi +fi dnl Checks needed for psql reader @@ -80,48 +104,115 @@ dnl only set PG_LDFLAGS if it's not found. AC_ARG_WITH( libpq, [AS_HELP_STRING([--without-libpq], [don't compile in Postgres capability])]) - -if test x"$with_libpq" != x"no" ; then - AC_SEARCH_LIBS([PQexec], [pq], [libpq_in_std_lib_path=yes]) - - AC_ARG_VAR([PG_CONFIG], [Full pathname of the pg_config program shipped with Postgresql]) - if test x"$cross_compiling" != x"yes" ; then - AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin]) - fi - if test -n "$PG_CONFIG" ; then - AC_SUBST(PG_CONFIG) - AC_DEFINE([PSQL_SUPPORT], 1, - [Define to 1 if building in support for reading from postgres databases.]) - PG_CFLAGS=-I`$PG_CONFIG --includedir` - AC_SUBST(PG_CFLAGS) - - if test "x$libpq_in_std_lib_path" != x"yes" ; then - PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`" - fi - AC_SUBST(PG_LDFLAGS) - - PG_LIBS=-lpq - AC_SUBST(PG_LIBS) - PKG_CHECK_EXISTS(libssl, - AC_DEFINE([USE_SSL],1, - [Define to 1 if the openssl library is present.]) - ,) - fi +AC_ARG_VAR([PG_CONFIG], + [Full pathname of the pg_config program shipped with Postgresql]) +AC_PATH_PROG([PG_CONFIG], [pg_config], [], + [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin]) + +if test x"$with_libpq" != x"no" && test -n "$PG_CONFIG" ; then + AC_SUBST(PG_CONFIG) + PG_CFLAGS=-I`$PG_CONFIG --includedir` + AC_SUBST(PG_CFLAGS) + + AC_CHECK_LIB([pq], [PQexec], + [:], + [PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"]) + AC_SUBST(PG_LDFLAGS) + + PG_LIBS=-lpq + AC_SUBST(PG_LIBS) + + PKG_CHECK_EXISTS(libssl, + AC_DEFINE([USE_SSL],1, + [Define to 1 if the openssl library is present.]) + ,) + + # Now verify that we can actually link against libpq. If we are + # cross-compiling and picked up a host libpq, or if libpq is just + # badly installed, this will fail. + AC_CACHE_CHECK( + [whether -lpq links successfully], + [pspp_cv_have_libpq], + [save_CPPFLAGS=$CPPFLAGS + save_LIBS=$LIBS + save_LDFLAGS=$LDFLAGS + CPPFLAGS="$PG_CFLAGS $CPPFLAGS" + LIBS="$PG_LIBS $LIBS" + LDFLAGS="$PG_LDFLAGS $LDFLAGS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include + ], [PQfinish (0);])], + [pspp_cv_have_libpq=yes], + [pspp_cv_have_libpq=no]) + CPPFLAGS=$save_CPPFLAGS + LIBS=$save_LIBS + LDFLAGS=$save_LDFLAGS]) + + if test $pspp_cv_have_libpq = yes; then + AC_DEFINE([PSQL_SUPPORT], [1], + [Define to 1 if building in support for reading from postgres + databases.]) + else + PG_CONFIG= + PG_CFLAGS= + PG_LDFLAGS= + PG_LIBS= + fi +else + pspp_cv_have_libpq=no fi -AM_CONDITIONAL(PSQL_SUPPORT, test -n "$PG_CONFIG") - -dnl Checks needed for Gnumeric reader -gnm_support=yes; -PKG_CHECK_MODULES(LIBXML2, libxml-2.0,, - [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no;]); -AC_SEARCH_LIBS(gzopen,z,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;]) -AC_CHECK_HEADERS(zlib.h,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;]) - -if test x"$gnm_support" = x"yes" ; then - AC_DEFINE([GNM_SUPPORT], 1, - [Define to 1 if building in support for reading Gnumeric files.]) +AM_CONDITIONAL(PSQL_SUPPORT, test $pspp_cv_have_libpq = yes) + +dnl Check for libxml2 +PKG_CHECK_MODULES( + [LIBXML2], [libxml-2.0], + [HAVE_LIBXML2=yes], + [HAVE_LIBXML2=no + PSPP_OPTIONAL_PREREQ([libxml2])]) + +dnl Check for zlib. +AC_SEARCH_LIBS( + [gzopen], [z], + [HAVE_ZLIB=yes], + [HAVE_ZLIB=no + PSPP_OPTIONAL_PREREQ([zlib])]) +AC_CHECK_HEADERS( + [zlib.h], + [], + [HAVE_ZLIB=no + PSPP_OPTIONAL_PREREQ([zlib])]) + +dnl Avoid interference between zlib's crc32() function and gnulib's +dnl crc32() function, which have different signatures. PSPP calls +dnl only gnulib's crc32() directly, but it calls zlib's crc32() +dnl indirectly through other zlib calls. If we don't rename gnulib's +dnl crc32(), then zlib will call gnulib's version instead of its own, +dnl causing failures. (This can happen even if zlib isn't detected +dnl directly, because other libraries that PSPP uses, e.g. libpng, +dnl sometimes use zlib themselves.) +AC_DEFINE( + [crc32], [gl_crc32], + [Avoid making zlib call gnulib's crc32() instead of its own.]) + +dnl Gnumeric support requires libxml2 and zlib. +if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then + GNM_SUPPORT=yes + AC_DEFINE( + [GNM_SUPPORT], [1], + [Define to 1 if building in support for reading Gnumeric files.]) +else + GNM_SUPPORT=no fi -AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes") +AM_CONDITIONAL([GNM_SUPPORT], [test $GNM_SUPPORT = yes]) + +dnl ODT support requires libxml2. +if test $HAVE_LIBXML2 = yes; then + AC_DEFINE( + [ODT_SUPPORT], [1], + [Define to 1 if building in support for writing ODT files.]) +fi +AM_CONDITIONAL([ODT_SUPPORT], [test $HAVE_LIBXML2 = yes]) AC_ARG_WITH( gui_tools, @@ -131,7 +222,21 @@ if test x"$with_gui_tools" = x"yes" ; then fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") -AM_CONDITIONAL(WITH_PERL_MODULE, test x"$cross_compiling" != x"yes") +AC_ARG_WITH( + [perl-module], + [AS_HELP_STRING([--without-perl-module], [do not build the Perl module])], + [case $with_perl_module in # ( + yes|no) ;; # ( + *) AC_MSG_FAILURE([--with-perl-module argument must be 'yes' or 'no']) ;; + esac + WITH_PERL_MODULE=$with_perl_module], + [if test x"$cross_compiling" != x"yes"; then + WITH_PERL_MODULE=yes + else + WITH_PERL_MODULE=no + fi]) +AC_SUBST([WITH_PERL_MODULE]) +AM_CONDITIONAL(WITH_PERL_MODULE, test $WITH_PERL_MODULE = yes) AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])]) @@ -178,7 +283,7 @@ fi PSPP_READLINE dnl Checks for header files. -AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h]) +AC_CHECK_HEADERS([sys/wait.h fpu_control.h ieeefp.h fenv.h pwd.h]) # For gnulib. gl_INIT @@ -213,7 +318,8 @@ RELOCATABLE_STRIP=: PSPP_CHECK_PREREQS -AC_CONFIG_FILES([Makefile gl/Makefile]) +AC_CONFIG_FILES( + [Makefile gl/Makefile po/Makefile tests/atlocal perl-module/lib/PSPP.pm]) AC_OUTPUT echo "PSPP configured successfully." diff --git a/doc/.gitignore b/doc/.gitignore index 06eb3bb1..c3755566 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -3,6 +3,7 @@ Makefile.in ni.texi pspp-dev.info pspp.info* +pspp.xml stamp-1 stamp-vti version-dev.texi diff --git a/doc/automake.mk b/doc/automake.mk index b75aee0b..b31aa769 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -6,7 +6,6 @@ doc_pspp_TEXINFOS = doc/version.texi \ doc/bugs.texi \ doc/command-index.texi \ doc/concept-index.texi \ - doc/configuring.texi \ doc/data-io.texi \ doc/data-selection.texi \ doc/expressions.texi \ @@ -46,21 +45,22 @@ EXTRA_DIST += doc/pspp.man \ doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl @$(MKDIR_P) doc - @PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@ + $(PERL) $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@ doc/tut.texi: @$(MKDIR_P) doc echo "@set example-dir $(examplesdir)" > $@ -doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS) +$(srcdir)/doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS) @$(MKDIR_P) doc - $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) $< -o $@ - $(SED) -i -e 's/Time-&-Date/Time-\&-Date/g' $@ + $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \ + $(top_srcdir)/doc/pspp.texinfo -o - \ + | $(SED) 's/Time-&-Date/Time-\&-Date/g' > $@ + $(XMLLINT) --output /dev/null $@ 2>&1 2> /dev/null || ( $(RM) $@ && false ) docbookdir = $(docdir) -docbook_DATA = doc/pspp.xml - +dist_docbook_DATA = doc/pspp.xml EXTRA_DIST += doc/OChangeLog CLEANFILES += pspp-dev.dvi $(docbook_DATA) diff --git a/doc/configuring.texi b/doc/configuring.texi deleted file mode 100644 index 164d9ab1..00000000 --- a/doc/configuring.texi +++ /dev/null @@ -1,897 +0,0 @@ -@node Configuration -@appendix Configuring PSPP -@cindex configuration -@cindex PSPP, configuring - -This chapter describe how to configure PSPP for your system. - -@menu -* File locations:: How PSPP finds config files. -* Configuration techniques:: Many different methods of configuration... -* Configuration files:: How configuration files are read. -* Environment variables:: All about environment variables. -* Output devices:: Describing your terminal(s) and printer(s). -* PostScript driver class:: Configuration of PostScript devices. -* ASCII driver class:: Configuration of character-code devices. -* HTML driver class:: Configuration for HTML output. -* Miscellaneous configuring:: Even more configuration variables. -@end menu - -@node File locations -@section Locating configuration files - -PSPP searches each directory in the configuration file path for most -configuration files. The default configuration file path searches first -@file{$HOME/.pspp}, then the package system configuration directory (usually -@file{/usr/local/etc/pspp} or @file{/etc/pspp}). The value of -environment variable @env{PSPP_CONFIG_PATH}, if defined, overrides this -default path. Finally, @samp{-B @var{path}} or -@samp{--config-dir=@var{path}} specified on the command line has highest -priority. - -@node Configuration techniques -@section Configuration techniques - -There are many ways that PSPP can be configured. These are -described in the list below. Values given by earlier items take -precedence over those given by later items. - -@enumerate -@item -Syntax commands that modify settings, such as @cmd{SET}. @xref{SET}. - -@item -Command-line options. @xref{Invocation}. - -@item -PSPP-specific environment variable contents. @xref{Environment -variables}. - -@item -General environment variable contents. @xref{Environment variables}. - -@item -Configuration file contents. @xref{Configuration files}. - -@item -Fallback defaults. -@end enumerate - -Some of the above may not apply to a particular setting. - -@node Configuration files -@section Configuration files - -Most configuration files have a common form: - -@itemize @bullet -@item -Each line forms a separate command or directive. This means that lines -cannot be broken up, unless they are spliced together with a trailing -backslash, as described below. - -@item -Before anything else is done, trailing white space is removed. - -@item -When a line ends in a backslash (@samp{\}), the backslash is removed, -and the next line is read and appended to the current line. - -@itemize @minus -@item -White space preceding the backslash is retained. - -@item -This rule continues to be applied until the line read does not end in a -backslash. - -@item -It is an error if the last line in the file ends in a backslash. -@end itemize - -@item -Comments are introduced by an octothorpe (@samp{#}), and continue until the -end of the line. - -@itemize @minus -@item -An octothorpe inside balanced pairs of double quotation marks (@samp{"}) -or single quotation marks (@samp{'}) does not introduce a comment. - -@item -The backslash character can be used inside balanced quotes of either -type to escape the following character as a literal character. - -(This is distinct from the use of a backslash as a line-splicing -character.) - -@item -Line splicing takes place before comment removal. -@end itemize - -@item -Blank lines, and lines that contain only white space, are ignored. -@end itemize - -@node Environment variables -@section Environment variables - -You may think the concept of environment variables is a fairly simple -one. However, the author of PSPP has found a way to complicate -even something so simple. Environment variables are further described -in the sections below: - -@menu -* Environment substitutions:: How environment substitutions are made. -* Predefined variables:: A few variables are automatically defined. -@end menu - -@node Environment substitutions -@subsection Environment substitutions - -Much of the power of environment variables lies in the way that they may -be substituted into configuration files. Variable substitutions are -described below. - -The line is scanned from left to right. In this scan, all characters -other than dollar signs (@samp{$}) are retained without change. Dollar -signs introduce environment variable references. References -take three forms: - -@table @code -@item $@var{var} -Replaced by the value of environment variable @var{var}. @var{var} must -consist of either one or more letters, or exactly one non-alphabetic -character other than a left brace (@samp{@{}). - -@item $@{@var{var}@} -Same as above, but @var{var} may contain any character (except -@samp{@}}). - -@item $$ -Replaced by a single dollar sign. -@end table - -Undefined variables expand to a empty value. - -@node Predefined variables -@subsection Predefined environment variables - -There are two environment variables predefined for use in environment -substitutions: - -@table @samp -@item VER -Defined as the version number of PSPP, as a string, in a format -something like @samp{0.9.4}. - -@item ARCH -Defined as the host architecture of PSPP, as a string, in standard -cpu-manufacturer-OS format. For instance, Debian GNU/Linux 1.1 on an -Intel machine defines this as @samp{i586-unknown-linux}. This is -somewhat dependent on the system used to compile PSPP. -@end table - -Nothing prevents these values from being overridden, although it's a -good idea not to do so. - -@node Output devices -@section Output devices - -Configuring output devices is the most complicated aspect of configuring -PSPP. The output device configuration file is named -@file{devices}. It is searched for using the usual algorithm for -finding configuration files (@pxref{File locations}). Each line in the -file is read in the usual manner for configuration files -(@pxref{Configuration files}). - -Lines in @file{devices} are divided into three categories, described -briefly in the table below: - -@table @i -@item driver category definitions -Define a driver in terms of other drivers. - -@item macro definitions -Define environment variables local to the output driver -configuration file. - -@item device definitions -Describe the configuration of an output device. -@end table - -The following sections further elaborate the contents of the -@file{devices} file. - -@menu -* Driver categories:: How to organize the driver namespace. -* Macro definitions:: Environment variables local to @file{devices}. -* Device definitions:: Output device descriptions. -* Dimensions:: Lengths, widths, sizes, @enddots{} -* Distinguishing line types:: Details on @file{devices} parsing. -* Tokenizing lines:: Dividing @file{devices} lines into tokens. -@end menu - -@node Driver categories -@subsection Driver categories - -Drivers can be divided into categories. Drivers are specified by their -names, or by the names of the categories that they are contained in. -Only certain drivers are enabled each time PSPP is run; by -default, these are the drivers in the category `default'. To enable a -different set of drivers, use the @samp{-o @var{device}} command-line -option (@pxref{Invocation}). - -Categories are specified with a line of the form -@samp{@var{category}=@var{driver1} @var{driver2} @var{driver3} @var{@dots{}} -@var{driver@var{n}}}. This line specifies that the category -@var{category} is composed of drivers named @var{driver1}, -@var{driver2}, and so on. There may be any number of drivers in the -category, from zero on up. - -Categories may also be specified on the command line -(@pxref{Invocation}). - -This is all you need to know about categories. If you're still curious, -read on. - -First of all, the term `categories' is a bit of a misnomer. In fact, -the internal representation is nothing like the hierarchy that the term -seems to imply: a linear list is used to keep track of the enabled -drivers. - -When PSPP first begins reading @file{devices}, this list contains -the name of any drivers or categories specified on the command line, or -the single item `default' if none were specified. - -Each time a category definition is specified, the list is searched for -an item with the value of @var{category}. If a matching item is found, -it is deleted. If there was a match, the list of drivers (@var{driver1} -through @var{driver@var{n}}) is then appended to the list. - -Each time a driver definition line is encountered, the list is searched. -If the list contains an item with that driver's name, the driver is -enabled and the item is deleted from the list. Otherwise, the driver -is not enabled. - -It is an error if the list is not empty when the end of @file{devices} -is reached. - -@node Macro definitions -@subsection Macro definitions - -Macro definitions take the form @samp{define @var{macroname} -@var{definition}}. In such a macro definition, the environment variable -@var{macroname} is defined to expand to the value @var{definition}. -Before the definition is made, however, any macros used in -@var{definition} are expanded. - -Please note the following nuances of macro usage: - -@itemize @bullet -@item -For the purposes of this section, @dfn{macro} and @dfn{environment -variable} are synonyms. - -@item -Macros may not take arguments. - -@item -Macros may not recurse. - -@item -Macros are just environment variable definitions like other environment -variable definitions, with the exception that they are limited in scope -to the @file{devices} configuration file. - -@item -Macros override other all environment variables of the same name (within -the scope of @file{devices}). - -@item -Earlier macro definitions for a particular @var{key} override later -ones. In particular, macro definitions on the command line override -those in the device definition file. @xref{Non-option Arguments}. - -@item -There are two predefined macros, whose values are determined at runtime: - -@table @samp -@item viewwidth -Defined as the width of the console screen, in columns of text. - -@item viewlength -Defined as the length of the console screen, in lines of text. -@end table -@end itemize - -@node Device definitions -@subsection Driver definitions - -Driver definitions are the ultimate purpose of the @file{devices} -configuration file. These are where the real action is. Driver -definitions tell PSPP where it should send its output. - -Each driver definition line is divided into four fields. These fields -are delimited by colons (@samp{:}). Each line is subjected to -environment variable interpolation before it is processed further -(@pxref{Environment substitutions}). From left to right, the four -fields are, in brief: - -@table @i -@item driver name -A unique identifier, used to determine whether to enable the driver. - -@item class name -One of the predefined driver classes supported by PSPP. The -currently supported driver classes include `postscript' and `ascii'. - -@item device type(s) -Zero or more of the following keywords, delimited by spaces: - -@table @code -@item screen - -Indicates that the device is a screen display. This may reduce the -amount of buffering done by the driver, to make interactive use more -convenient. - -@item printer - -Indicates that the device is a printer. - -@item listing - -Indicates that the device is a listing file. -@end table - -These options are just hints to PSPP and do not cause the output to be -directed to the screen, or to the printer, or to a listing file---those -must be set elsewhere in the options. They are used primarily to decide -which devices should be enabled at any given time. @xref{SET}, for more -information. - -@item options -An optional set of options to pass to the driver itself. The exact -format for the options varies among drivers. -@end table - -The driver is enabled if: - -@enumerate -@item -Its driver name is specified on the command line, or - -@item -It's in a category specified on the command line, or - -@item -If no categories or driver names are specified on the command line, it -is in category @code{default}. -@end enumerate - -For more information on driver names, see @ref{Driver categories}. - -The class name must be one of those supported by PSPP. The -classes supported depend on the options with which PSPP was -compiled. See later sections in this chapter for descriptions of the -available driver classes. - -Options are dependent on the driver. See the driver descriptions for -details. - -@node Dimensions -@subsection Dimensions - -Quite often in configuration it is necessary to specify a length or a -size. PSPP uses a common syntax for all such, calling them -collectively by the name @dfn{dimensions}. - -@itemize @bullet -@item -You can specify dimensions in decimal form (@samp{12.5}) or as -fractions, either as mixed numbers (@samp{12-1/2}) or raw fractions -(@samp{25/2}). - -@item -A number of different units are available. These are suffixed to the -numeric part of the dimension. There must be no spaces between the -number and the unit. The available units are identical to those offered -by the popular typesetting system @TeX{}: - -@table @code -@item in -inch (1 @code{in} = 2.54 @code{cm}) - -@item " -inch (1 @code{in} = 2.54 @code{cm}) - -@item pt -printer's point (1 @code{in} = 72.27 @code{pt}) - -@item pc -pica (12 @code{pt} = 1 @code{pc}) - -@item bp -PostScript point (1 @code{in} = 72 @code{bp}) - -@item cm -centimeter - -@item mm -millimeter (10 @code{mm} = 1 @code{cm}) - -@item dd -didot point (1157 @code{dd} = 1238 @code{pt}) - -@item cc -cicero (1 @code{cc} = 12 @code{dd}) - -@item sp -scaled point (65536 @code{sp} = 1 @code{pt}) -@end table - -@item -If no explicit unit is given, PSPP attempts to guess the best unit: - -@itemize @minus -@item -Numbers less than 50 are assumed to be in inches. - -@item -Numbers 50 or greater are assumed to be in millimeters. -@end itemize -@end itemize - -@node Distinguishing line types -@subsection How lines are divided into types - -The lines in @file{devices} are distinguished in the following manner: - -@enumerate -@item -Leading white space is removed. - -@item -If the resulting line begins with the exact string @code{define}, -followed by one or more white space characters, the line is processed as -a macro definition. - -@item -Otherwise, the line is scanned for the first instance of a colon -(@samp{:}) or an equals sign (@samp{=}). - -@item -If a colon is encountered first, the line is processed as a driver -definition. - -@item -Otherwise, if an equals sign is encountered, the line is processed as a -macro definition. - -@item -Otherwise, the line is ill-formed. -@end enumerate - -@node Tokenizing lines -@subsection How lines are divided into tokens - -Each driver definition line is run through a simple tokenizer. This -tokenizer recognizes two basic types of tokens. - -The first type is an equals sign (@samp{=}). Equals signs are both -delimiters between tokens and tokens in themselves. - -The second type is an identifier or string token. Identifiers and -strings are equivalent after tokenization, though they are written -differently. An identifier is any string of characters other than -white space or equals sign. - -A string is introduced by a single- or double-quote character (@samp{'} -or @samp{"}) and, in general, continues until the next occurrence of -that same character. The following standard C escapes can also be -embedded within strings: - -@table @code -@item \' -A single-quote (@samp{'}). - -@item \" -A double-quote (@samp{"}). - -@item \? -A question mark (@samp{?}). Included for hysterical raisins. - -@item \\ -A backslash (@samp{\}). - -@item \a -Audio bell (ASCII 7). - -@item \b -Backspace (ASCII 8). - -@item \f -Formfeed (ASCII 12). - -@item \n -New-line (ASCII 10) - -@item \r -Carriage return (ASCII 13). - -@item \t -Tab (ASCII 9). - -@item \v -Vertical tab (ASCII 11). - -@item \@var{o}@var{o}@var{o} -Each @samp{o} must be an octal digit. The character is the one having -the octal value specified. Any number of octal digits is read and -interpreted; only the lower 8 bits are used. - -@item \x@var{h}@var{h} -Each @samp{h} must be a hex digit. The character is the one having the -hexadecimal value specified. Any number of hex digits is read and -interpreted; only the lower 8 bits are used. -@end table - -Tokens, outside of quoted strings, are delimited by white space or equals -signs. - -@node PostScript driver class -@section The PostScript driver class - -The @code{postscript} driver class is used to produce output that is -acceptable to PostScript printers and other interpreters. - -The available options are listed below. - -@table @code -@item output-file=@var{file-name} - -File to which output should be sent. This can be an ordinary file name -(i.e., @code{"pspp.ps"}), a pipe (i.e., @code{"|lpr"}), or -stdout (@code{"-"}). Default: @code{"pspp.ps"}. - -@item headers=@var{boolean} - -Controls whether the standard headers showing the time and date and -title and subtitle are printed at the top of each page. Default: -@code{on}. - -@item paper-size=@var{paper-size} - -Paper size. You may specify a name (e.g.@: @code{a4}, @code{letter}) -or measurements (e.g.@: @code{210x297}, @code{8.5x11in}). - -The default paper size is taken from the @env{PAPERSIZE} environment -variable or the file indicated by the @env{PAPERCONF} environment -variable, if either variable is set. If not, and your system supports -the @code{LC_PAPER} locale category, then the default paper size is -taken from the locale. Otherwise, if @file{/etc/papersize} exists, -the default paper size is read from it. As a last resort, A4 paper is -assumed. - -@item orientation=@var{orientation} - -Either @code{portrait} or @code{landscape}. Default: @code{portrait}. - -@item left-margin=@var{dimension} -@itemx right-margin=@var{dimension} -@itemx top-margin=@var{dimension} -@itemx bottom-margin=@var{dimension} - -Sets the margins around the page. The headers, if enabled, are not -included in the margins; they are in addition to the margins. For a -description of dimensions, see @ref{Dimensions}. Default: @code{0.5in}. - -@item prop-font=@var{afm-file}[,@var{font-file}[,@var{encoding-file}]] -@itemx emph-font=@var{afm-file}[,@var{font-file}[,@var{encoding-file}]] -@itemx fixed-font=@var{afm-file}[,@var{font-file}[,@var{encoding-file}]] - -Sets the font used for proportional, emphasized, or fixed-pitch text. -The only required value is @var{afm-file}, the AFM file for the font. - -If specified, @var{font-file} will be downloaded to the printer at the -beginning of the print job. The font file may be in PFA or PFB format. - -The font is reencoded as specified in @var{encoding-file}, if specified. -Each line in @var{encoding-file} should consist of a PostScript -character name and a decimal encoding value (between 0 and 255), -separated by white space. Blank lines and comments introduced by -@samp{#} are also allowed. - -The files specified on these options are located as follows. If -the file name begins with @samp{/}, then it is taken as an absolute -path. Otherwise, PSPP searches its configuration path for the specified -name prefixed by @code{psfonts/} (@pxref{File locations}). - -Default: proportional font @code{Times-Roman.afm}, emphasis font -@code{Times-Italic.afm}, fixed-pitch font @code{Courier.afm}. - -@item font-size=@var{font-size} - -Sets the size of the default fonts, in thousandths of a point. Default: -10000 (10 point). - -@item line-gutter=@var{dimension} - -Sets the width of white space on either side of lines that border text -or graphics objects. @xref{Dimensions}. Default: @code{1pt}. - -@item line-spacing=@var{dimension} - -Sets the spacing between the lines in a double line in a table. -Default: @code{1pt}. - -@item line-width=@var{dimension} - -Sets the width of the lines used in tables. Default: @code{0.5pt}. -@end table - -@node ASCII driver class -@section The ASCII driver class - -The ASCII driver class produces output that can be displayed on a -terminal or output to printers. The ASCII driver has class name -@samp{ascii}. - -The available options are listed below. - -@table @code -@item output-file=@var{file-name} - -File to which output should be sent. This can be an ordinary file name -(e.g., @code{"pspp.txt"}), a pipe (e.g., @code{"|more"}), or -stdout (@code{"-"}). Default: @code{"pspp.list"}. - -@item chart-files=@var{file-name-template} -Template for the file names used for charts. The name should contain -a single @samp{#}, which is replaced by the chart number. Default: -@file{"pspp-#.png"}. - -@item chart-type=@var{type}. -Type of charts to output. Available types typically include @samp{X}, -@samp{png}, @samp{gif}, @samp{svg}, @samp{ps}, @samp{cgm}, @samp{fig}, -@samp{pcl}, @samp{hpgl}, @samp{regis}, @samp{tek}, and @samp{meta}. -Default: @samp{png}. - -You may specify @samp{none} to disable chart output. Charts are also -disabled if your installation of PSPP was compiled without -@code{libplot}. - -@item paginate=@var{boolean} - -If set, a formfeed will be written at the end of every page. Default: -@code{on}. - -@item tab-width=@var{tab-width-value} - -The distance between tab stops for this device. If set to 0, tabs will -not be used in the output. Default: @code{8}. - -@item headers=@var{boolean} - -If enabled, two lines of header information giving title and subtitle, -page number, date and time, and PSPP version are printed at the top of -every page. These two lines are in addition to any top margin -requested. Default: @code{on}. - -@item length=@var{line-count} - -Physical length of a page. Headers and margins are subtracted from -this value. You may specify the number of lines as a number, or for -screen output you may specify @code{auto} to track the height of the -terminal as it changes. Default: @code{66}. - -@item width=@var{character-count} - -Physical width of a page. Margins are subtracted from this value. -You may specify the width as a number of characters, or for screen -output you may specify @code{auto} to track the width of the terminal -as it changes. Default: @code{79}. - -@item top-margin=@var{top-margin-lines} - -Length of the top margin, in lines. PSPP subtracts this value from -the page length. Default: @code{2}. - -@item bottom-margin=@var{bottom-margin-lines} - -Length of the bottom margin, in lines. PSPP subtracts this value from -the page length. Default: @code{2}. - -@item box[@var{line-type}]=@var{box-chars} - -The characters used for lines in tables produced by the ASCII driver can -be changed using this option. @var{line-type} is used to indicate which -type of line to change; @var{box-chars} is the character or string of -characters to use for this type of line. - -@var{line-type} must be a 4-digit number. The digits are in the order -`right', `bottom', `left', `top'. The possibilities for each digit are: - -@table @asis -@item 0 -No line. - -@item 1 -Single line. - -@item 2 -Double line. -@end table - -Examples: - -@table @code -@item box[0101]="|" - -Sets @samp{|} as the character to use for a single-width line with -bottom and top components. - -@item box[2222]="#" - -Sets @samp{#} as the character to use for the intersection of four -double-width lines, one each from the top, bottom, left and right. - -@item box[1100]="\xda" - -Sets @samp{"\xda"}, which under MS-DOS is a box character suitable for -the top-left corner of a box, as the character for the intersection of -two single-width lines, one each from the right and bottom. - -@end table - -Defaults: - -@itemize @bullet -@item -@code{box[0000]=" "} - -@item -@code{box[1000]="-"} -@*@code{box[0010]="-"} -@*@code{box[1010]="-"} - -@item -@code{box[0100]="|"} -@*@code{box[0001]="|"} -@*@code{box[0101]="|"} - -@item -@code{box[2000]="="} -@*@code{box[0020]="="} -@*@code{box[2020]="="} - -@item -@code{box[3000]="="} -@*@code{box[0030]="="} -@*@code{box[3030]="="} - -@item -For all others, @samp{+} is used unless there are double lines or -special lines, in which case @samp{#} is used. -@end itemize - -@item init=@var{init-string} -If set, this string is written at the beginning of each output file. -It can be used to initialize device features, e.g.@: to enable VT100 -line-drawing characters. - -@item emphasis=@var{emphasis-style} - -How to emphasize text. Your choices are @code{bold}, @code{underline}, -or @code{none}. Bold and underline emphasis are achieved with -overstriking, which may not be supported by all the software to which -you might pass the output. -@end table - -@node HTML driver class -@section The HTML driver class - -The @code{html} driver class is used to produce output for viewing in -tables-capable web browsers such as Emacs' w3-mode. Its configuration -is very simple. Currently, the output has a very plain format. In the -future, further work may be done on improving the output appearance. - -There are only a few options: - -@table @code -@item output-file=@var{file-name} - -File to which output should be sent. This can be an ordinary file name -(i.e., @code{"pspp.ps"}), a pipe (i.e., @code{"|lpr"}), or -stdout (@code{"-"}). Default: @file{"pspp.html"}. - -@item chart-files=@var{file-name-template} -Template for the file names used for charts, which are output in PNG -format. The name should contain a single @samp{#}, which is replaced by -the chart number. Default: @file{"pspp-#.png"}. -@end table - -@node Miscellaneous configuring -@section Miscellaneous configuration - -The following environment variables can be used to further configure -PSPP: - -@table @code -@item HOME - -Used to determine the user's home directory. No default value. - -@item STAT_INCLUDE_PATH - -Path used to find include files in PSPP syntax files. Defaults vary -across operating systems: - -@table @asis -@item UNIX - -@itemize @bullet -@item -@file{.} - -@item -@file{$HOME/.pspp/include} - -@item -@file{/usr/local/lib/pspp/include} - -@item -@file{/usr/lib/pspp/include} - -@item -@file{/usr/local/share/pspp/include} - -@item -@file{/usr/share/pspp/include} -@end itemize - -@item MS-DOS - -@itemize @bullet -@item -@file{.} - -@item -@file{C:\PSPP\INCLUDE} - -@item -@file{$PATH} -@end itemize - -@item Other OSes -No default path. -@end table - -@item TERM - -The terminal type @code{termcap} or @code{ncurses} will use, if such -support was compiled into PSPP. - -@item STAT_OUTPUT_INIT_FILE - -The basename used to search for the driver definition file. -@xref{Output devices}. @xref{File locations}. Default: @code{devices}. - -@item STAT_OUTPUT_INIT_PATH - -The path used to search for the driver definition file. -@xref{File locations}. Default: the standard configuration path. - -@item TMPDIR - -The directory in which PSPP stores its temporary files (used when sorting -cases or concatenating large numbers of cases). -Default: (UNIX) @file{/tmp}, (MS-DOS) @file{\}, (other OSes) empty string. - -@item TEMP -@item TMP - -Under MS-DOS only, these variables are consulted after TMPDIR, in this -order. -@end table diff --git a/doc/data-io.texi b/doc/data-io.texi index 1bad334e..fc521cae 100644 --- a/doc/data-io.texi +++ b/doc/data-io.texi @@ -826,8 +826,7 @@ random variates between 0 and 10. LIST /VARIABLES=var_list /CASES=FROM start_index TO end_index BY incr_index - /FORMAT=@{UNNUMBERED,NUMBERED@} @{WRAP,SINGLE@} - @{NOWEIGHT,WEIGHT@} + /FORMAT=@{UNNUMBERED,NUMBERED@} @{WRAP,SINGLE@} @end display The @cmd{LIST} procedure prints the values of specified variables to the @@ -846,9 +845,7 @@ settings. If CASES is not specified then all cases are printed. The FORMAT subcommand can be used to change the output format. NUMBERED will print case numbers along with each case; UNNUMBERED, the default, causes the case numbers to be omitted. The WRAP and SINGLE settings are -currently not used. WEIGHT will cause case weights to be printed along -with variable values; NOWEIGHT, the default, causes case weights to be -omitted from the output. +currently not used. Case numbers start from 1. They are counted after all transformations have been considered. diff --git a/doc/dev/concepts.texi b/doc/dev/concepts.texi index 06652d62..f1347379 100644 --- a/doc/dev/concepts.texi +++ b/doc/dev/concepts.texi @@ -2106,17 +2106,23 @@ if through a call to @code{var_create} with those arguments of variables, and returns the new variable. @end deftypefun -@deftypefun {struct variable *} dict_clone_var (struct dictionary *@var{dict}, const struct variable *@var{old_var}, const char *@var{name}) -@deftypefunx {struct variable *} dict_clone_var_assert (struct dictionary *@var{dict}, const struct variable *@var{old_var}, const char *@var{name}) +@deftypefun {struct variable *} dict_clone_var (struct dictionary *@var{dict}, const struct variable *@var{old_var}) +@deftypefunx {struct variable *} dict_clone_var_assert (struct dictionary *@var{dict}, const struct variable *@var{old_var}) Creates a new variable as a clone of @var{var}, inserts the new -variable into @var{dict}, and returns the new variable. The new -variable is named @var{name}. Other properties of the new variable -are copied from @var{old_var}, except for those not copied by -@code{var_clone} (@pxref{var_clone}). +variable into @var{dict}, and returns the new variable. Other +properties of the new variable are copied from @var{old_var}, except +for those not copied by @code{var_clone} (@pxref{var_clone}). @var{var} does not need to be a member of any dictionary. @end deftypefun +@deftypefun {struct variable *} dict_clone_var_as (struct dictionary *@var{dict}, const struct variable *@var{old_var}, const char *@var{name}) +@deftypefunx {struct variable *} dict_clone_var_as_assert (struct dictionary *@var{dict}, const struct variable *@var{old_var}, const char *@var{name}) +These functions are similar to @code{dict_clone_var} and +@code{dict_clone_var_assert}, respectively, except that the new +variable is named @var{name} instead of keeping @var{old_var}'s name. +@end deftypefun + @node Dictionary Deleting Variables @subsection Deleting Variables diff --git a/doc/dev/system-file-format.texi b/doc/dev/system-file-format.texi index a404d0d6..972b1331 100644 --- a/doc/dev/system-file-format.texi +++ b/doc/dev/system-file-format.texi @@ -5,8 +5,10 @@ A system file encapsulates a set of cases and dictionary information that describes how they may be interpreted. This chapter describes the format of a system file. -System files use three data types: 8-bit characters, 32-bit integers, -and 64-bit floating points, called here @code{char}, @code{int32}, and +System files use four data types: 8-bit characters, 32-bit integers, +64-bit integers, +and 64-bit floating points, called here @code{char}, @code{int32}, +@code{int64}, and @code{flt64}, respectively. Data is not necessarily aligned on a word or double-word boundary: the long variable name record (@pxref{Long Variable Names Record}) and very long string records (@pxref{Very Long @@ -58,24 +60,7 @@ if present. Document record, if present. @item -Any of the following records, if present, in any order: - -@itemize @minus -@item -Machine integer info record. - -@item -Machine floating-point info record. - -@item -Variable display parameter record. - -@item -Long variable names record. - -@item -Miscellaneous informational records. -@end itemize +Any records not explicitly included in this list, in any order. @item Dictionary termination record. @@ -93,12 +78,14 @@ Each type of record is described separately below. * Document Record:: * Machine Integer Info Record:: * Machine Floating-Point Info Record:: +* Multiple Response Sets Records:: * Variable Display Parameter Record:: * Long Variable Names Record:: * Very Long String Record:: * Character Encoding Record:: * Long String Value Labels Record:: * Data File and Variable Attributes Records:: +* Extended Number of Cases Record:: * Miscellaneous Informational Records:: * Dictionary Termination Record:: * Data Record:: @@ -166,7 +153,7 @@ In the general case it is not possible to determine the number of cases that will be output to a system file at the time that the header is written. The way that this is dealt with is by writing the entire system file, including the header, then seeking back to the beginning of -the file and writing just the @code{ncases} field. For `files' in which +the file and writing just the @code{ncases} field. For files in which this is not valid, the seek operation fails. In this case, @code{ncases} remains -1. @@ -280,8 +267,10 @@ stops (@samp{.}). The variable name is padded on the right with spaces. @item int32 label_len; This field is present only if @code{has_var_label} is set to 1. It is -set to the length, in characters, of the variable label, which must be a -number between 0 and 120. +set to the length, in characters, of the variable label. The +documented maximum length varies from 120 to 255 based on SPSS +version, but some files have been seen with longer labels. PSPP +accepts longer labels and truncates them to 255 bytes on input. @item char label[]; This field is present only if @code{has_var_label} is set to 1. It has @@ -439,7 +428,9 @@ in length. Its type and width cannot be determined until the following value label variables record (see below) is read. @item char label_len; -The label's length, in bytes. +The label's length, in bytes. The documented maximum length varies +from 60 to 120 based on SPSS version. PSPP supports value labels up +to 255 bytes long. @item char label[]; @code{label_len} bytes of the actual label, followed by up to 7 bytes @@ -609,6 +600,129 @@ The value used for HIGHEST in missing values. The value used for LOWEST in missing values. @end table +@node Multiple Response Sets Records +@section Multiple Response Sets Records + +The system file format has two different types of records that +represent multiple response sets (@pxref{MRSETS,,,pspp, PSPP Users +Guide}). The first type of record describes multiple response sets +that can be understood by SPSS before version 14. The second type of +record, with a closely related format, is used for multiple dichotomy +sets that use the CATEGORYLABELS=COUNTEDVALUES feature added in +version 14. + +@example +/* @r{Header.} */ +int32 rec_type; +int32 subtype; +int32 size; +int32 count; + +/* @r{Exactly @code{count} bytes of data.} */ +char mrsets[]; +@end example + +@table @code +@item int32 rec_type; +Record type. Always set to 7. + +@item int32 subtype; +Record subtype. Set to 7 for records that describe multiple response +sets understood by SPSS before version 14, or to 19 for records that +describe dichotomy sets that use the CATEGORYLABELS=COUNTEDVALUES +feature added in version 14. + +@item int32 size; +The size of each element in the @code{mrsets} member. Always set to 1. + +@item int32 count; +The total number of bytes in @code{mrsets}. + +@item char mrsets[]; +A series of multiple response sets, each of which consists of the +following: + +@itemize @bullet +@item +The set's name (an identifier that begins with @samp{$}). + +@item +An equals sign (@samp{=}). + +@item +@samp{C} for a multiple category set, @samp{D} for a multiple +dichotomy set with CATEGORYLABELS=VARLABELS, or @samp{E} for a +multiple dichotomy set with CATEGORYLABELS=COUNTEDVALUES. + +@item +For a multiple dichotomy set with CATEGORYLABELS=COUNTEDVALUES, a +space, followed by a number expressed as decimal digits, followed by a +space. If LABELSOURCE=VARLABEL was specified on MRSETS, then the +number is 11; otherwise it is 1.@footnote{This part of the format may +not be fully understood, because only a single example of each +possibility has been examined.} + +@item +For either kind of multiple dichotomy set, the counted value, as a +positive integer count specified as decimal digits, followed by a +space, followed by as many string bytes as specified in the count. If +the set contains numeric variables, the string consists of the counted +integer value expressed as decimal digits. If the set contains string +variables, the string contains the counted string value. Either way, +the string may be padded on the right with spaces (older versions of +SPSS seem to always pad to a width of 8 bytes; newer versions don't). + +@item +A space. + +@item +The multiple response set's label, using the same format as for the +counted value for multiple dichotomy sets. A string of length 0 means +that the set does not have a label. A string of length 0 is also +written if LABELSOURCE=VARLABEL was specified. + +@item +A space. + +@item +The names of the variables in the set, each separated from the +previous by a single space. + +@item +A line feed (byte 0x0a). +@end itemize +@end table + +Example: Given appropriate variable definitions, consider the +following MRSETS command: + +@example +MRSETS /MCGROUP NAME=$a LABEL='my mcgroup' VARIABLES=a b c + /MDGROUP NAME=$b VARIABLES=g e f d VALUE=55 + /MDGROUP NAME=$c LABEL='mdgroup #2' VARIABLES=h i j VALUE='Yes' + /MDGROUP NAME=$d LABEL='third mdgroup' CATEGORYLABELS=COUNTEDVALUES + VARIABLES=k l m VALUE=34 + /MDGROUP NAME=$e CATEGORYLABELS=COUNTEDVALUES LABELSOURCE=VARLABEL + VARIABLES=n o p VALUE='choice'. +@end example + +The above would generate the following multiple response set record of +subtype 7: + +@example +$a=C 10 my mcgroup a b c +$b=D2 55 0 g e f d +$c=D3 Yes 10 mdgroup #2 h i j +@end example + +It would also generate the following multiple response set record with +subtype 19: + +@example +$d=E 1 2 34 13 third mdgroup k l m +$e=E 11 6 choice 0 n o p +@end example + @node Variable Display Parameter Record @section Variable Display Parameter Record @@ -973,7 +1087,8 @@ element. In record type 18, this field contains a sequence of one or more variable attribute sets. If more than one variable attribute set is present, each one after the first is delimited from the previous by -@code{/}. Each variable attribute set consists of a variable name, +@code{/}. Each variable attribute set consists of a (potentially +long) variable name, followed by @code{:}, followed by an attribute set with the same syntax as on record type 17. @@ -1000,6 +1115,45 @@ will contain a variable attribute record with the following contents: 00000030 0a 29 |.) | @end example +@node Extended Number of Cases Record +@section Extended Number of Cases Record + +The file header record expresses the number of cases in the system +file as an int32 (@pxref{File Header Record}). This record allows the +number of cases in the system file to be expressed as a 64-bit number. + +@example +int32 rec_type; +int32 subtype; +int32 size; +int32 count; +int64 unknown; +int64 ncases64; +@end example + +@table @code +@item int32 rec_type; +Record type. Always set to 7. + +@item int32 subtype; +Record subtype. Always set to 16. + +@item int32 size; +Size of each element. Always set to 8. + +@item int32 count; +Number of pieces of data in the data part. Alway set to 2. + +@item int64 unknown; +Meaning unknown. Always set to 1. + +@item int64 ncases64; +Number of cases in the file as a 64-bit integer. Presumably this +could be -1 to indicate that the number of cases is unknown, for the +same reason as @code{ncases} in the file header record, but this has +not been observed in the wild. +@end table + @node Miscellaneous Informational Records @section Miscellaneous Informational Records @@ -1093,6 +1247,9 @@ value @var{code} - @var{bias}, where variable @code{bias} from the file header. For example, code 105 with bias 100.0 (the normal value) indicates a numeric variable of value 5. +One file has been seen written by SPSS 14 that contained such a code +in a @emph{string} field with the value 0 (after the bias is +subtracted) as a way of encoding null bytes. @item 252 End of file. This code may or may not appear at the end of the data diff --git a/doc/fdl.texi b/doc/fdl.texi index 3ab5da10..8711c1ae 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -1,12 +1,15 @@ @node GNU Free Documentation License @appendix GNU Free Documentation License -@cindex FDL, GNU Free Documentation License -@center Version 1.2, November 2002 +@c The GNU Free Documentation License. +@center Version 1.3, 3 November 2008 + +@c This file is intended to be included within another document, +@c hence no sectioning command or @node. @display -Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc. -51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +@uref{http://fsf.org/} Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -111,6 +114,9 @@ formats which do not have any title page as such, ``Title Page'' means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. +The ``publisher'' means any person or entity that distributes copies +of the Document to the public. + A section ``Entitled XYZ'' means a named subunit of the Document whose title either is precisely XYZ or contains XYZ in parentheses following text that translates XYZ in another language. (Here XYZ stands for a @@ -379,13 +385,30 @@ title. @item TERMINATION -You may not copy, modify, sublicense, or distribute the Document except -as expressly provided for under this License. Any other attempt to -copy, modify, sublicense or distribute the Document is void, and will -automatically terminate your rights under this License. However, -parties who have received copies, or rights, from you under this -License will not have their licenses terminated so long as such -parties remain in full compliance. +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. @item FUTURE REVISIONS OF THIS LICENSE @@ -403,11 +426,46 @@ following the terms and conditions either of that specified version or of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not -as a draft) by the Free Software Foundation. +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +@item +RELICENSING + +``Massive Multiauthor Collaboration Site'' (or ``MMC Site'') means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +``Massive Multiauthor Collaboration'' (or ``MMC'') contained in the +site means any set of copyrightable works thus published on the MMC +site. + +``CC-BY-SA'' means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +``Incorporate'' means to publish or republish a Document, in whole or +in part, as part of another Document. + +An MMC is ``eligible for relicensing'' if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole +or in part into the MMC, (1) had no cover texts or invariant sections, +and (2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + @end enumerate @page -@appendixsec ADDENDUM: How to use this License for your documents +@heading ADDENDUM: How to use this License for your documents To use this License in a document you have written, include a copy of the License in the document and put the following copyright and @@ -417,7 +475,7 @@ license notices just after the title page: @group Copyright (C) @var{year} @var{your name}. Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.2 + under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU @@ -426,7 +484,7 @@ license notices just after the title page: @end smallexample If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with...Texts.'' line with this: +replace the ``with@dots{}Texts.'' line with this: @smallexample @group diff --git a/doc/introduction.texi b/doc/introduction.texi index 735a54c5..f96a2329 100644 --- a/doc/introduction.texi +++ b/doc/introduction.texi @@ -15,15 +15,15 @@ later in this manual. @cindex files, PSPP @cindex output, PSPP @cindex PostScript +@cindex PDF +@cindex HTML +@cindex SVG @cindex graphics @cindex Ghostscript @cindex Free Software Foundation -PSPP produces output in two forms: tables and charts. Both of these can -be written in several formats; currently, ASCII, PostScript, and HTML -are supported. In the future, more drivers, such as PCL and X Window -System drivers, may be developed. For now, Ghostscript, available from -the Free Software Foundation, may be used to convert PostScript chart -output to other formats. +PSPP produces tables and charts as output, which it can produce in +several formats; currently, ASCII, PostScript, PDF, HTML, and SVG are +supported. The current version of PSPP, @value{VERSION}, is woefully incomplete in terms of its statistical procedure support. PSPP is a work in progress. diff --git a/doc/invoking.texi b/doc/invoking.texi index 3052162f..830d1764 100644 --- a/doc/invoking.texi +++ b/doc/invoking.texi @@ -1,265 +1,422 @@ -@node Invocation - -@chapter Starting PSPP +@node Invoking PSPP +@chapter Invoking @command{pspp} @cindex invocation @cindex PSPP, invoking -There are two separate user interfaces for PSPP. -There is the command line interface, which responds to commands -typed by the user. -The command line interface is generally available on more platforms -than the graphic user interface and since it doesn't require a -graphics device it can be used from a remote terminal. -Platforms which have a windowing system may also be able to support -the graphic user interface. -The graphic user interface can perform all functionality of the -command line interface. -In addition it gives an instantaneous view of the data, variables and -statistical output. - -Whichever interface you choose, a basic understanding of the concepts -used by PSPP is necessary before effective use of the system can be achieved. +PSPP has two separate user interfaces. This chapter describes +@command{pspp}, PSPP's command-line driven text-based user interface. +The following chapter briefly describes PSPPIRE, the graphical user +interface to PSPP. +The sections below describe the @command{pspp} program's command-line +interface. @menu -* The command line user interface:: -* The graphic user interface:: +* Main Options:: +* PDF PostScript and SVG Output Options:: +* Plain Text Output Options:: +* HTML Output Options:: +* OpenDocument Output Options:: +* Comma-Separated Value Output Options:: @end menu +@node Main Options +@section Main Options -@node The command line user interface -@section The command line user interface +Here is a summary of all the options, grouped by type, followed by +explanations in the same order. -@cindex command line, options -@cindex options, command-line +In the table, arguments to long options also apply to any +corresponding short options. +@table @emph +@item Non-option arguments @example -pspp [ -B @var{dir} | --config-dir=@var{dir} ] [ -o @var{device} | --device=@var{device} ] - [ -a @{compatible|enhanced@} | --algorithm=@{compatible|enhanced@}] - [ -x @{compatible|enhanced@} | --syntax=@{compatible|enhanced@}] - [ -I- | --no-include ] - [ -I @var{dir} | --include=@var{dir} ] [ -i | --interactive ] - [ -r | --no-statrc ] [ -h | --help ] [ -l | --list ] - [ -s | --safer ] - [ --testing-mode ] [ -V | --version ] [ -v | --verbose ] - [ @var{key}=@var{value} ] @var{file}@enddots{} +@var{syntax-file} @end example -@menu -* Non-option Arguments:: Specifying syntax files and output devices. -* Configuration Options:: Change the configuration for the current run. -* Input and output options:: Controlling input and output files. -* Language control options:: Language variants. -* Informational options:: Helpful information about PSPP. -@end menu - -@node Non-option Arguments -@subsection Non-option Arguments - -Syntax files and output device substitutions can be specified on -PSPP's command line: - -@table @code -@item @var{file} - -A file by itself on the command line will be executed as a syntax file. -If multiple files are specified, they are executed in order, as if -their contents had been given in a single file. -PSPP terminates after the syntax files run, unless the @code{-i} or -@code{--interactive} option is given (@pxref{Language control options}). - -@item @var{key}=@var{value} - -Defines an output device macro @var{key} to expand to @var{value}, -overriding any macro having the same @var{key} defined in the device -configuration file. @xref{Macro definitions}. - -@end table - -There is one other way to specify a syntax file, if your operating -system supports it. If you have a syntax file @file{foobar.stat}, put -the notation - +@item Output options @example -#! /usr/local/bin/pspp +-o, --output=@var{output-file} +-O @var{option}=@var{value} +-O format=@var{format} +-O device=@{terminal|listing@} +-e, --error-file=@var{error-file} @end example -at the top, and mark the file as executable with @code{chmod +x -foobar.stat}. (If PSPP is not installed in @file{/usr/local/bin}, -then insert its actual installation directory into the syntax file -instead.) Now you should be able to invoke the syntax file just by -typing its name. You can include any options on the command line as -usual. PSPP entirely ignores any lines beginning with @samp{#!}. - -@node Configuration Options -@subsection Configuration Options - -Configuration options are used to change PSPP's configuration for the -current run. The configuration options are: - -@table @code -@item -a @{compatible|enhanced@} -@itemx --algorithm=@{compatible|enhanced@} - -If you chose @code{compatible}, then PSPP will use the same algorithms -as used by some proprietary statistical analysis packages. -This is not recommended, as these algorithms are inferior and in some cases -compeletely broken. -The default setting is @code{enhanced}. -Certain commands have subcommands which allow you to override this setting on -a per command basis. - -@item -B @var{dir} -@itemx --config-dir=@var{dir} - -Sets the configuration directory to @var{dir}. @xref{File locations}. +@item Language options +@example +-I, --include=@var{dir} +-I-, --no-include +-i, --interactive +-r, --no-statrc +-a, --algorithm=@{compatible|enhanced@} +-x, --syntax=@{compatible|enhanced@} +@end example -@item -o @var{device} -@itemx --device=@var{device} +@item Informational options +@example +-h, --help +-V, --version +@end example -Selects the output device with name @var{device}. If this option is -given more than once, then all devices mentioned are selected. This -option disables all devices besides those mentioned on the command line. +@item Other options +@example +-s, --safer +--testing-mode +@end example @end table -@node Input and output options -@subsection Input and output options - -Input and output options affect how PSPP reads input and writes -output. These are the input and output options: - @table @code -@item -I- -@itemx --no-include - -Clears all directories from the include path. This includes all -directories put in the include path by default. @xref{Miscellaneous -configuring}. +@item @var{syntax-file} +Read and execute the named syntax file. If no syntax files are +specified, PSPP prompts for commands. If any syntax files are +specified, PSPP by default exits after it runs them, but you may make +it prompt for commands by specifying @samp{-} as an additional syntax +file. + +@item -o @var{output-file} +Write output to @var{output-file}. PSPP has several different output +drivers that support output in various formats (use @option{--help} to +list the available formats). Specify this option more than once to +produce multiple output files, presumably in different formats. + +Use @samp{-} as @var{output-file} to write output to standard output. + +If no @option{-o} option is used, then PSPP writes output to standard +output in plain text format. + +@item -O @var{option}=@var{value} +Sets an option for the output file configured by a preceding +@option{-o}. Most options are specific to particular output formats. +A few options that apply generically are listed below. + +@item -O format=@var{format} +PSPP uses the extension of the file name given on @option{-o} to +select an output format. Use this option to override this choice by +specifying an alternate format, e.g.@: @option{-o pspp.out -O html} to +write HTML to a file named @file{pspp.out}. Use @option{--help} to +list the available formats. + +@item -O device=@{terminal|listing@} +Sets whether PSPP considers the output device configured by the +preceding @option{-o} to be a terminal or a listing device. This +affects what output will be sent to the device, as configured by the +SET command's output routing subcommands (@pxref{SET}). By default, +output written to standard output is considered a terminal device and +other output is considered a listing device. + +@item -e @var{error-file} +@itemx --error-file=@var{error-file} +Configures a file to receive PSPP error, warning, and note messages in +plain text format. Use @samp{-} as @var{error-file} to write messages +to standard output. The default error file is standard output in the +absence of these options, but this is suppressed if an output device +writes to standard output (or another terminal), to avoid printing +every message twice. Use @samp{none} as @var{error-file} to +explicitly suppress the default. @item -I @var{dir} @itemx --include=@var{dir} +Appends @var{dir} to the set of directories searched by INCLUDE +(@pxref{INCLUDE}) and INSERT (@pxref{INSERT}). -Appends directory @var{dir} to the path that is searched for include -files in PSPP syntax files. - -@item --testing-mode - -Invoke heuristics to assist with testing PSPP. For use by @code{make -check} and similar scripts. -@end table - -@node Language control options -@subsection Language control options - -Language control options control how PSPP syntax files are parsed and -interpreted. The available language control options are: +@item -I- +@itemx --no-include +Clears all directories from the include path, including directories +inserted in the include path by default. The default include path is +@file{.} (the current directory), followed by @file{.pspp} in the +user's home directory, followed by PSPP's system configuration +directory (usually @file{/etc/pspp} or @file{/usr/local/etc/pspp}). -@table @code @item -i @itemx --interactive - -When a syntax file is specified on the command line, PSPP normally -terminates after processing it. Giving this option will cause PSPP to -bring up a command prompt after processing the syntax file. - -In addition, this forces syntax files to be interpreted in interactive -mode, rather than the default batch mode. @xref{Tokenizing lines}, for -information on the differences between batch mode and interactive mode -command interpretation. +This option forces syntax files to be interpreted in interactive +mode, rather than the default batch mode. @xref{Syntax Variants}, for +a description of the differences. @item -r @itemx --no-statrc +Disables running @file{rc} at PSPP startup time. + +@item -a @{enhanced|compatible@} +@itemx --algorithm=@{enhanced|compatible@} +With @code{enhanced}, the default, PSPP uses the best implemented +algorithms for statistical procedures. With @code{compatible}, +however, PSPP will in some cases use inferior algorithms to produce +the same results as the proprietary program SPSS. + +Some commands have subcommands that override this setting on a per +command basis. + +@item -x @{enhanced|compatible@} +@itemx --syntax=@{enhanced|compatible@} +With @code{enhanced}, the default, PSPP accepts its own extensions +beyond those compatible with the proprietary program SPSS. With +@code{compatible}, PSPP rejects syntax that uses these extensions. + +@item -? +@itemx --help +Prints a message describing PSPP command-line syntax and the available +device formats, then exits. -Prevents the execution of the PSPP startup syntax file. +@item -V +@itemx --version +Prints a brief message listing PSPP's version, warranties you don't +have, copying conditions and copyright, and e-mail address for bug +reports, then exits. @item -s @itemx --safer - Disables certain unsafe operations. This includes the ERASE and HOST commands, as well as use of pipes as input and output files. -@end table - -@node Informational options -@subsection Informational options - -Informational options cause information about PSPP to be written to -the terminal. Here are the available options: - -@table @code -@item -h -@item --help - -Prints a message describing PSPP command-line syntax and the available -device driver classes, then terminates. -@item -l -@item --list +@item --testing-mode +Invoke heuristics to assist with testing PSPP. For use by @code{make +check} and similar scripts. +@end table -Lists the available device driver classes, then terminates. +@node PDF PostScript and SVG Output Options +@section PDF, PostScript, and SVG Output Options -@item -x @{compatible|enhanced@} -@itemx --syntax=@{compatible|enhanced@} +To produce output in PDF, PostScript, and SVG formats, specify +@option{-o @var{file}} on the PSPP command line, optionally followed +by any of the options shown in the table below to customize the output +format. -If you chose @code{compatible}, then PSPP will only accept command syntax that -is compatible with the proprietary program SPSS. -If you choose @code{enhanced} then additional syntax will be available. -The default is @code{enhanced}. +PDF, PostScript, and SVG output is only available if your installation +of PSPP was compiled with the Cairo library. +@table @code +@item -O format=@{pdf|ps|svg@} +Specify the output format. This is only necessary if the file name +given on @option{-o} does not end in @file{.pdf}, @file{.ps}, or +@file{.svg}. + +@item -O paper-size=@var{paper-size} +Paper size, as a name (e.g.@: @code{a4}, @code{letter}) or +measurements (e.g.@: @code{210x297}, @code{8.5x11in}). + +The default paper size is taken from the @env{PAPERSIZE} environment +variable or the file indicated by the @env{PAPERCONF} environment +variable, if either variable is set. If not, and your system supports +the @code{LC_PAPER} locale category, then the default paper size is +taken from the locale. Otherwise, if @file{/etc/papersize} exists, +the default paper size is read from it. As a last resort, A4 paper is +assumed. + +@item -O orientation=@var{orientation} +Either @code{portrait} or @code{landscape}. Default: @code{portrait}. + +@item -O headers=@var{boolean} +When enabled, headers showing the time and date, title and subtitle, +and page number are printed at the top of each page. Default: +@code{on}. + +@item -O left-margin=@var{dimension} +@itemx -O right-margin=@var{dimension} +@itemx -O top-margin=@var{dimension} +@itemx -O bottom-margin=@var{dimension} +Sets the margins around the page. The headers, if enabled, are not +included in the margins; they are in addition to the margins. See +below for the allowed forms of @var{dimension} Default: @code{0.5in}. + +@item -O prop-font=@var{font-name} +@itemx -O emph-font=@var{font-name} +@itemx -O fixed-font=@var{font-name} +Sets the font used for proportional, emphasized, or fixed-pitch text. +Most systems support CSS-like font names such as ``serif'' and +``monospace'', but a wide range of system-specific font are likely to +be supported as well. + +Default: proportional font @code{serif}, emphasis font @code{serif +italic}, fixed-pitch font @code{monospace}. + +@item -O font-size=@var{font-size} +Sets the size of the default fonts, in thousandths of a point. Default: +10000 (10 point). + +@item -O line-gutter=@var{dimension} +Sets the width of white space on either side of lines that border text +or graphics objects. Default: @code{1pt}. + +@item -O line-spacing=@var{dimension} +Sets the spacing between the lines in a double line in a table. +Default: @code{1pt}. + +@item -O line-width=@var{dimension} +Sets the width of the lines used in tables. Default: @code{0.5pt}. +@end table -@item -V -@item --version +Each @var{dimension} value above may be specified in various units +based on its suffix: @samp{mm} for millimeters, @samp{in} for inches, +or @samp{pt} for points. Lacking a suffix, numbers below 50 are +assumed to be in inches and those about 50 are assumed to be in +millimeters. -Prints a brief message listing PSPP's version, warranties you don't -have, copying conditions and copyright, and e-mail address for bug -reports, then terminates. +@node Plain Text Output Options +@section Plain Text Output Options -@item -v -@item --verbose +PSPP can produce plain text output, drawing boxes using ASCII or +Unicode line drawing characters. To produce plain text output, +specify @option{-o @var{file}} on the PSPP command line, optionally +followed by options from the table below to customize the output +format. -Increments PSPP's verbosity level. Higher verbosity levels cause -PSPP to display greater amounts of information about what it is -doing. Often useful for debugging PSPP's configuration. +@table @code +@item -O format=txt +Specify the output format. This is only necessary if the file name +given on @option{-o} does not end in @file{.txt} or @file{.list}. + +@item -O charts=@{@var{template}.png|none@} +Name for chart files included in output. The value should be a file +name that includes a single @samp{#} and ends in @file{png}. When a +chart is output, the @samp{#} is replaced by the chart number. The +default is the file name specified on @option{-o} with the extension +stripped off and replaced by @file{-#.png}. + +Specify @code{none} to disable chart output. Charts are always +disabled if your installation of PSPP was compiled without the +Cairo library. + +@item -O paginate=@var{boolean} +If set, PSPP writes an ASCII formfeed the end of every page. Default: +@code{off}. + +@item -O headers=@var{boolean} +If enabled, PSPP prints two lines of header information giving title +and subtitle, page number, date and time, and PSPP version are printed +at the top of every page. These two lines are in addition to any top +margin requested. Default: @code{off}. + +@item -O length=@var{line-count} +Physical length of a page. Headers and margins are subtracted from +this value. You may specify the number of lines as a number, or for +screen output you may specify @code{auto} to track the height of the +terminal as it changes. Default: @code{66}. + +@item -O width=@var{character-count} +Width of a page, in characters. Margins are subtracted from this +value. For screen output you may specify @code{auto} in place of a +number to track the width of the terminal as it changes. Default: +@code{79}. + +@item -O top-margin=@var{top-margin-lines} +Length of the top margin, in lines. PSPP subtracts this value from +the page length. Default: @code{0}. + +@item -O bottom-margin=@var{bottom-margin-lines} +Length of the bottom margin, in lines. PSPP subtracts this value from +the page length. Default: @code{0}. + +@item -O box[@var{line-type}]=@var{box-chars} +Sets the characters used for lines in tables. @var{line-type} is a +4-digit number that indicates the type of line to change, in the order +`right', `bottom', `left', `top'. Each digit is 0 for ``no line'', 1 +for a single line, and 2 for a double line. @var{box-chars} is the +character or string of characters to use for this type of line. + +For example, @code{box[0101]="|"} sets @samp{|} as the character to +use for a single-width vertical line, and @code{box[1100]="\xda"} sets +@samp{"\xda"}, which on MS-DOS is suitable for the top-left corner of +a box, as the character for the intersection of two single-width +lines, one each from the right and bottom. + +The defaults use @samp{-}, @samp{|}, and @samp{+} for single-width +lines and @samp{=} and @samp{#} for double-width lines. + +@item -O init=@var{init-string} +If set, this string is written at the beginning of each output file. +It can be used to initialize device features, e.g.@: to enable VT100 +line-drawing characters. + +@item -O emphasis=@{none|bold|underline@} +How to emphasize text. Bold and underline emphasis are achieved with +overstriking, which may not be supported by all the software to which +you might pass the output. Default: @code{none}. +@end table -This option can be given multiple times to set the verbosity level to -that value. The default verbosity level is 0, in which no informational -messages will be displayed. +@node HTML Output Options +@section HTML Output Options -Higher verbosity levels cause messages to be displayed when the -corresponding events take place. +To produce output in HTML format, specify @option{-o @var{file}} on +the PSPP command line, optionally followed by any of the options shown +in the table below to customize the output format. -@table @asis -@item 1 +@table @code +@item -O format=html +Specify the output format. This is only necessary if the file name +given on @option{-o} does not end in @file{.html}. -Driver and subsystem initializations. +@item -O charts=@{@var{template}.png|none@} +Sets the name used for chart files. @xref{Plain Text Output Options}, +for details. +@end table -@item 2 +@node OpenDocument Output Options +@section OpenDocument Output Options -Completion of driver initializations. Beginning of driver closings. +To produce output as an OpenDocument text (ODT) document, specify +@option{-o @var{file}} on the PSPP command line. If @var{file} does +not end in @file{.odt}, you must also specify @option{-O format=odt}. -@item 3 +ODT support is only available if your installation of PSPP was +compiled with the libxml2 library. -Completion of driver closings. +The OpenDocument output format does not have any configurable options. -@item 4 +@node Comma-Separated Value Output Options +@section Comma-Separated Value Output Options -Files searched for; success of searches. +To produce output in comma-separated value (CSV) format, specify +@option{-o @var{file}} on the PSPP command line, optionally followed +by any of the options shown in the table below to customize the output +format. -@item 5 +@table @code +@item -O format=csv +Specify the output format. This is only necessary if the file name +given on @option{-o} does not end in @file{.csv}. -Individual directories included in file searches. +@item -O separator=@var{field-separator} +Sets the character used to separate fields. The default is a comma +(@samp{,}). @end table -Each verbosity level also includes messages from lower verbosity levels. +The CSV format used is an extension to that specified in RFC 4180: +@table @asis +@item Tables +Each table row is output on a separate line, and each column is output +as a field. The contents of a cell that spans multiple rows or +columns is output only for the top-left row and column; the rest are +output as empty fields. When a table has a caption, it is output just +above the table as a single field prefixed by @samp{Table:}. + +@item Text +Text in output is printed as a field on a line by itself. The TITLE +and SUBTITLE produce similar output, prefixed by @samp{Title:} or +@samp{Subtitle:}, respectively. + +@item Messages +Errors, warnings, and notes are printed the same way as text. + +@item Charts +Charts are not included in CSV output. @end table +Successive output items are separated by a blank line. -@node The graphic user interface +@node Invoking PSPPIRE +@chapter Invoking @command{psppire} @section The graphic user interface - @cindex Graphic user interface @cindex PSPPIRE +The PSPPIRE graphic user interface for PSPP can perform all +functionality of the command line interface. In addition it gives an +instantaneous view of the data, variables and statistical output. + The graphic user interface can be started by typing @command{psppire} at a command prompt. Alternatively many systems have a system of interactive menus or buttons diff --git a/doc/language.texi b/doc/language.texi index e23a5580..19c9a6b9 100644 --- a/doc/language.texi +++ b/doc/language.texi @@ -3,10 +3,6 @@ @cindex language, PSPP @cindex PSPP, language -@note{PSPP is not even close to completion. -Only a few statistical procedures are implemented. PSPP -is a work in progress.} - This chapter discusses elements common to many PSPP commands. Later chapters will describe individual commands in detail. @@ -212,9 +208,9 @@ new command, which allows for visual indentation of a command without that command being considered part of the previous command. The period terminating the end of a command is optional but recommended. -In interactive mode, each command must either be terminated with a period, -or an empty line must follow the command. -The use of (@samp{+} and @samp{@minus{}} as continuation characters is not +In interactive mode, each command must be terminated with a period +or by a blank line. +The use of @samp{+} and @samp{@minus{}} as continuation characters is not permitted. @node Types of Commands diff --git a/doc/pspp-dev.texinfo b/doc/pspp-dev.texinfo index 4b92654d..41b8566c 100644 --- a/doc/pspp-dev.texinfo +++ b/doc/pspp-dev.texinfo @@ -37,19 +37,15 @@ This manual is for GNU PSPP version @value{VERSION}, software for statistical analysis. -Copyright @copyright{} 1997, 1998, 2004, 2005, 2007 Free Software Foundation, Inc. +Copyright @copyright{} 1997, 1998, 2004, 2005, 2007, 2010 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,'' -and with the Back-Cover Texts as in (a) below. A copy of the -license is included in the section entitled ``GNU Free Documentation -License.'' - -(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and -modify this GNU manual.'' +under the terms of the GNU Free Documentation License, Version 1.3 +or any later version published by the Free Software Foundation; +with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. +A copy of the license is included in the section entitled "GNU +Free Documentation License". @end quotation @end copying diff --git a/doc/pspp.texinfo b/doc/pspp.texinfo index 562b328d..18828047 100644 --- a/doc/pspp.texinfo +++ b/doc/pspp.texinfo @@ -33,6 +33,7 @@ @dircategory Math @direntry * PSPP: (pspp). Statistical analysis package. +* PSPPIRE: (pspp). Graphical user interface to PSPP. @end direntry @copying @@ -43,15 +44,11 @@ Copyright @copyright{} 1997, 1998, 2004, 2005, 2009 Free Software Foundation, In @quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with the Front-Cover Texts being ``A GNU Manual,'' -and with the Back-Cover Texts as in (a) below. A copy of the -license is included in the section entitled ``GNU Free Documentation -License.'' - -(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and -modify this GNU manual.'' +under the terms of the GNU Free Documentation License, Version 1.3 +or any later version published by the Free Software Foundation; +with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. +A copy of the license is included in the section entitled "GNU +Free Documentation License". @end quotation @end copying @@ -65,9 +62,8 @@ modify this GNU manual.'' @insertcopying @end titlepage -@chapheading Acknowledgements -The authors wish to thank -Network Theory Ltd +@c @chapheading Acknowledgements +The authors wish to thank Network Theory Ltd @url{http://www.network-theory.co.uk} for their financial support in the production of this manual. @@ -87,7 +83,8 @@ in the production of this manual. * Introduction:: Description of the package. * License:: Your rights and obligations. -* Invocation:: Starting and running PSPP. +* Invoking PSPP:: Starting the PSPP text-based interface. +* Invoking PSPPIRE:: Starting the PSPP graphical user interface. * Using PSPP:: How to use PSPP --- A brief tutorial. * Language:: Basics of the PSPP command language. * Expressions:: Numeric and string expression syntax. @@ -109,8 +106,6 @@ in the production of this manual. * Command Index:: Index of PSPP procedures. * Concept Index:: Index of concepts. -* Configuration:: Configuring PSPP. - * GNU Free Documentation License:: License for copying this manual. @end menu @@ -137,8 +132,6 @@ in the production of this manual. @include command-index.texi @include concept-index.texi -@include configuring.texi - @include fdl.texi @bye diff --git a/doc/statistics.texi b/doc/statistics.texi index 63e8f35a..81e16698 100644 --- a/doc/statistics.texi +++ b/doc/statistics.texi @@ -10,6 +10,7 @@ far. * EXAMINE:: Testing data for normality. * CORRELATIONS:: Correlation tables. * CROSSTABS:: Crosstabulation tables. +* FACTOR:: Factor analysis and Principal Components analysis * NPAR TESTS:: Nonparametric tests. * T-TEST:: Test hypotheses about means. * ONEWAY:: One way analysis of variance. @@ -117,11 +118,7 @@ respectively. FREQUENCIES /VARIABLES=var_list /FORMAT=@{TABLE,NOTABLE,LIMIT(limit)@} - @{STANDARD,CONDENSE,ONEPAGE[(onepage_limit)]@} - @{LABELS,NOLABELS@} @{AVALUE,DVALUE,AFREQ,DFREQ@} - @{SINGLE,DOUBLE@} - @{OLDPAGE,NEWPAGE@} /MISSING=@{EXCLUDE,INCLUDE@} /STATISTICS=@{DEFAULT,MEAN,SEMEAN,MEDIAN,MODE,STDDEV,VARIANCE, KURTOSIS,SKEWNESS,RANGE,MINIMUM,MAXIMUM,SUM, @@ -129,8 +126,9 @@ FREQUENCIES /NTILES=ntiles /PERCENTILES=percent@dots{} /HISTOGRAM=[MINIMUM(x_min)] [MAXIMUM(x_max)] - [@{FREQ,PCNT@}] [@{NONORMAL,NORMAL@}] - /PIECHART=[MINIMUM(x_min)] [MAXIMUM(x_max)] @{NOMISSING,MISSING@} + [@{FREQ[(y_max)],PERCENT[(y_max)]@}] [@{NONORMAL,NORMAL@}] + /PIECHART=[MINIMUM(x_min)] [MAXIMUM(x_max)] + [@{FREQ,PERCENT@}] [@{NOMISSING,MISSING@}] (These options are not currently implemented.) /BARCHART=@dots{} @@ -141,11 +139,9 @@ FREQUENCIES The @cmd{FREQUENCIES} procedure outputs frequency tables for specified variables. @cmd{FREQUENCIES} can also calculate and display descriptive statistics -(including median and mode) and percentiles. - -@cmd{FREQUENCIES} also support graphical output in the form of -histograms and pie charts. In the future, it will be able to produce -bar charts and output percentiles for grouped data. +(including median and mode) and percentiles, +@cmd{FREQUENCIES} can also output +histograms and pie charts. The VARIABLES subcommand is the only required subcommand. Specify the variables to be analyzed. @@ -160,30 +156,11 @@ variable specified. NOTABLE prevents them from being output. LIMIT with a numeric argument causes them to be output except when there are more than the specified number of values in the table. -@item -STANDARD frequency tables contain more complete information, but also to -take up more space on the printed page. CONDENSE frequency tables are -less informative but take up less space. ONEPAGE with a numeric -argument will output standard frequency tables if there are the -specified number of values or less, condensed tables otherwise. ONEPAGE -without an argument defaults to a threshold of 50 values. - -@item -LABELS causes value labels to be displayed in STANDARD frequency -tables. NOLABLES prevents this. - @item Normally frequency tables are sorted in ascending order by value. This is AVALUE. DVALUE tables are sorted in descending order by value. AFREQ and DFREQ tables are sorted in ascending and descending order, respectively, by frequency count. - -@item -SINGLE spaced frequency tables are closely spaced. DOUBLE spaced -frequency tables have wider spacing. - -@item -OLDPAGE and NEWPAGE are not currently used. @end itemize The MISSING subcommand controls the handling of user-missing values. @@ -207,13 +184,11 @@ boundaries of the data set divided into the specified number of ranges. For instance, @code{/NTILES=4} would cause quartiles to be reported. The HISTOGRAM subcommand causes the output to include a histogram for -each specified numeric variable. The X axis by default ranges from the -minimum to the maximum value observed in the data, but the MINIMUM and -MAXIMUM keywords can set an explicit range. The Y axis by default is -labeled in frequencies; use the PERCENT keyword to causes it to be -labeled in percent of the total observed count. Specify NORMAL to -superimpose a normal curve on the histogram. -Histograms are not created for string variables. +each specified numeric variable. The X axis by default ranges from +the minimum to the maximum value observed in the data, but the MINIMUM +and MAXIMUM keywords can set an explicit range. Specify NORMAL to +superimpose a normal curve on the histogram. Histograms are not +created for string variables. The PIECHART adds a pie chart for each variable to the data. Each slice represents one value, with the size of the slice proportional to @@ -222,6 +197,9 @@ slices. The MINIMUM and MAXIMUM keywords can be used to limit the displayed slices to a given range of values. The MISSING keyword adds slices for missing values. +The FREQ and PERCENT options on HISTOGRAM and PIECHART are accepted +but not currently honored. + @node EXAMINE @comment node-name, next, previous, up @section EXAMINE @@ -341,7 +319,7 @@ values are excluded as well as system-missing values. This is the default. If LISTWISE is set, then the entire case is excluded from analysis -whenever any variable specified in the any @cmd{/VARIABLES} subcommand +whenever any variable specified in any @cmd{/VARIABLES} subcommand contains a missing value. If PAIRWISE is set, then a case is considered missing only if either of the values for the particular coefficient are missing. @@ -553,6 +531,108 @@ Approximate T of uncertainty coefficient is wrong. Fixes for any of these deficiencies would be welcomed. +@node FACTOR +@section FACTOR + +@vindex FACTOR +@cindex factor analysis +@cindex principal components analysis +@cindex principal axis factoring +@cindex data reduction + +@display +FACTOR VARIABLES=var_list + + [ /METHOD = @{CORRELATION, COVARIANCE@} ] + + [ /EXTRACTION=@{PC, PAF@}] + + [ /ROTATION=@{VARIMAX, EQUAMAX, QUARTIMAX, NOROTATE@}] + + [ /PRINT=[INITIAL] [EXTRACTION] [ROTATION] [UNIVARIATE] [CORRELATION] [COVARIANCE] [DET] [SIG] [ALL] [DEFAULT] ] + + [ /PLOT=[EIGEN] ] + + [ /FORMAT=[SORT] [BLANK(@var{n})] [DEFAULT] ] + + [ /CRITERIA=[FACTORS(@var{n})] [MINEIGEN(@var{l})] [ITERATE(@var{m})] [ECONVERGE (@var{delta})] [DEFAULT] ] + + [ /MISSING=[@{LISTWISE, PAIRWISE@}] [@{INCLUDE, EXCLUDE@}] ] +@end display + +The FACTOR command performs Factor Analysis or Principal Axis Factoring on a dataset. It may be used to find +common factors in the data or for data reduction purposes. + +The VARIABLES subcommand is required. It lists the variables which are to partake in the analysis. + +The /EXTRACTION subcommand is used to specify the way in which factors (components) are extracted from the data. +If PC is specified, then Principal Components Analysis is used. If PAF is specified, then Principal Axis Factoring is +used. By default Principal Components Analysis will be used. + +The /ROTATION subcommand is used to specify the method by which the extracted solution will be rotated. +Three methods are available: VARIMAX (which is the default), EQUAMAX, and QUARTIMAX. +If don't want any rotation to be performed, the word NOROTATE will prevent the command from performing any +rotation on the data. Oblique rotations are not supported. + +The /METHOD subcommand should be used to determine whether the covariance matrix or the correlation matrix of the data is +to be analysed. By default, the correlation matrix is analysed. + +The /PRINT subcommand may be used to select which features of the analysis are reported: + +@itemize +@item UNIVARIATE + A table of mean values, standard deviations and total weights are printed. +@item INITIAL + Initial communalities and eigenvalues are printed. +@item EXTRACTION + Extracted communalities and eigenvalues are printed. +@item ROTATION + Rotated communalities and eigenvalues are printed. +@item CORRELATION + The correlation matrix is printed. +@item COVARIANCE + The covariance matrix is printed. +@item DET + The determinant of the correlation or covariance matrix is printed. +@item SIG + The significance of the elements of correlation matrix is printed. +@item ALL + All of the above are printed. +@item DEFAULT + Identical to INITIAL and EXTRACTION. +@end itemize + +If /PLOT=EIGEN is given, then a ``Scree'' plot of the eigenvalues will be printed. This can be useful for visualising +which factors (components) should be retained. + +The /FORMAT subcommand determined how data are to be displayed in loading matrices. If SORT is specified, then the variables +are sorted in descending order of significance. If BLANK(@var{n}) is specified, then coefficients whose absolute value is less +than @var{n} will not be printed. If the keyword DEFAULT is given, or if no /FORMAT subcommand is given, then no sorting is +performed, and all coefficients will be printed. + +The /CRITERIA subcommand is used to specify how the number of extracted factors (components) are chosen. If FACTORS(@var{n}) is +specified, where @var{n} is an integer, then @var{n} factors will be extracted. Otherwise, the MINEIGEN setting will +be used. MINEIGEN(@var{l}) requests that all factors whose eigenvalues are greater than or equal to @var{l} are extracted. +The default value of @var{l} is 1. The ECONVERGE and ITERATE settings have effect only when iterative algorithms for factor +extraction (such as Principal Axis Factoring) are used. ECONVERGE(@var{delta}) specifies that iteration should cease when +the maximum absolute value of the communality estimate between one iteration and the previous is less than @var{delta}. The +default value of @var{delta} is 0.001. +The ITERATE(@var{m}) setting sets the maximum number of iterations to @var{m}. The default value of @var{m} is 25. + +The @cmd{MISSING} subcommand determines the handling of missing variables. +If INCLUDE is set, then user-missing values are included in the +calculations, but system-missing values are not. +If EXCLUDE is set, which is the default, user-missing +values are excluded as well as system-missing values. +This is the default. +If LISTWISE is set, then the entire case is excluded from analysis +whenever any variable specified in the @cmd{VARIABLES} subcommand +contains a missing value. +If PAIRWISE is set, then a case is considered missing only if either of the +values for the particular coefficient are missing. +The default is LISTWISE. + + @node NPAR TESTS @section NPAR TESTS diff --git a/doc/tutorial.texi b/doc/tutorial.texi index 540da62a..994c0a7f 100644 --- a/doc/tutorial.texi +++ b/doc/tutorial.texi @@ -507,7 +507,7 @@ Output (dictionary information omitted for clarity): 1.2 RELIABILITY. Reliability Statistics #================#==========# -#Cronbach's Alpha#N of items# +#Cronbach's Alpha#N of Items# #================#==========# # .86# 3# #================#==========# diff --git a/doc/utilities.texi b/doc/utilities.texi index 6882aa21..fabec248 100644 --- a/doc/utilities.texi +++ b/doc/utilities.texi @@ -330,7 +330,6 @@ SET (interaction) /CPROMPT='cprompt_string' /DPROMPT='dprompt_string' - /ERRORBREAK=@{OFF,ON@} /MXERRS=max_errs /MXWARNS=max_warnings /PROMPT='prompt' @@ -353,17 +352,14 @@ SET /WRB=@{NATIVE,ISL,ISB,IDL,IDB,VF,VD,VG,ZS,ZL@} (output routing) - /ECHO=@{ON,OFF@} /ERRORS=@{ON,OFF,TERMINAL,LISTING,BOTH,NONE@} - /INCLUDE=@{ON,OFF@} /MESSAGES=@{ON,OFF,TERMINAL,LISTING,BOTH,NONE@} - /PRINTBACK=@{ON,OFF@} + /PRINTBACK=@{ON,OFF,TERMINAL,LISTING,BOTH,NONE@} /RESULTS=@{ON,OFF,TERMINAL,LISTING,BOTH,NONE@} (output driver options) /HEADERS=@{NO,YES,BLANK@} /LENGTH=@{NONE,length_in_lines@} - /LISTING=@{ON,OFF,'file-name'@} /MORE=@{ON,OFF@} /WIDTH=@{NARROW,WIDTH,n_characters@} @@ -383,7 +379,6 @@ SET /BOXSTRING=@{'xxx','xxxxxxxxxxx'@} /CASE=@{UPPER,UPLOW@} /CPI=cpi_value - /DISK=@{ON,OFF@} /HIGHRES=@{ON,OFF@} /HISTOGRAM='c' /LOWRES=@{AUTO,ON,OFF@} @@ -524,10 +519,6 @@ The command continuation prompt. The default is @samp{ > }. Prompt used when expecting data input within @cmd{BEGIN DATA} (@pxref{BEGIN DATA}). The default is @samp{data> }. -@item ERRORBREAK -Whether an error causes PSPP to stop processing the current command -file after finishing the current command. The default is OFF. - @item MXERRS The maximum number of errors before PSPP halts processing of the current command file. The default is 50. @@ -615,30 +606,55 @@ RB format (@pxref{Binary and Hexadecimal Numeric Formats}). The choices are the same as SET RIB. The default is NATIVE. @end table -Output routing subcommands affect where the output of transformations -and procedures is sent. These subcommands are +In the PSPP text-based interface, the output routing subcommands +affect where output is sent. The following values are allowed for +each of these subcommands: @table @asis -@item ECHO +@item OFF +@item NONE +Discard this kind of output. + +@item TERMINAL +Write this output to the terminal, but not to listing files and other +output devices. + +@item LISTING +Write this output to listing files and other output devices, but not +to the terminal. -If turned on, commands are written to the listing file as they are read -from command files. The default is OFF. +@item ON +@itemx BOTH +Write this type of output to all output devices. +@end table + +These output routing subcommands are: + +@table @asis +@item ERRORS +Applies to error and warning messages. The default is BOTH. -@itemx ERRORS -@itemx INCLUDE @itemx MESSAGES -@item PRINTBACK -@item RESULTS -Currently not used. +Applies to notes. The default is BOTH. + +@itemx PRINTBACK +Determines whether the syntax used for input is printed back as part +of the output. The default is NONE. + +@itemx RESULTS +Applies to everything not in one of the above categories, such as the +results of statistical procedures. The default is BOTH. @end table +These subcommands have no effect on output in the PSPP GUI +environment. + Output driver option subcommands affect output drivers' settings. These subcommands are @table @asis @item HEADERS @itemx LENGTH -@itemx LISTING @itemx MORE @itemx PAGER @itemx WIDTH @@ -646,7 +662,6 @@ subcommands are @cindex headers @cindex length -@cindex listing @cindex more @cindex pager @cindex width diff --git a/doc/variables.texi b/doc/variables.texi index c9e270bf..6b4e574e 100644 --- a/doc/variables.texi +++ b/doc/variables.texi @@ -12,6 +12,7 @@ several utility functions for examining and adjusting them. * LEAVE:: Don't clear variables between cases. * MISSING VALUES:: Set missing values for variables. * MODIFY VARS:: Rename, reorder, and drop variables. +* MRSETS:: Add, modify, and list multiple response sets. * NUMERIC:: Create new numeric variables. * PRINT FORMATS:: Set variable print formats. * RENAME VARIABLES:: Rename variables. @@ -293,6 +294,113 @@ Formats}); otherwise, the default is F8.2. Variables created with @cmd{NUMERIC} are initialized to the system-missing value. +@node MRSETS +@section MRSETS +@vindex MRSETS + +@display +MRSETS + /MDGROUP NAME=name VARIABLES=var_list VALUE=value + [CATEGORYLABELS=@{VARLABELS,COUNTEDVALUES@}] + [@{LABEL='label',LABELSOURCE=VARLABEL@}] + + /MCGROUP NAME=name VARIABLES=var_list [LABEL='label'] + + /DELETE NAME=@{[names],ALL@} + + /DISPLAY NAME=@{[names],ALL@} +@end display + +@cmd{MRSETS} creates, modifies, deletes, and displays multiple +response sets. A multiple response set is a set of variables that +represent multiple responses to a single survey question in one of the +two following ways: + +@itemize @bullet +@item +A @dfn{multiple dichotomy set} is analogous to a survey question with +a set of checkboxes. Each variable in the set is treated in a Boolean +fashion: one value (the "counted value") means that the box was +checked, and any other value means that it was not. + +@item +A @dfn{multiple category set} represents a survey question where the +respondent is instructed to list up to @var{n} choices. Each variable +represents one of the responses. +@end itemize + +Any number of subcommands may be specified in any order. + +The MDGROUP subcommand creates a new multiple dichotomy set or +replaces an existing multiple response set. The NAME, VARIABLES, and +VALUE specifications are required. The others are optional: + +@itemize @bullet +@item +NAME specifies the name used in syntax for the new multiple dichotomy +set. The name must begin with @samp{$}; it must otherwise follow the +rules for identifiers (@pxref{Tokens}). + +@item +VARIABLES specifies the variables that belong to the set. At least +two variables must be specified. The variables must be all string or +all numeric. + +@item +VALUE specifies the counted value. If the variables are numeric, the +value must be an integer. If the variables are strings, then the +value must be a string that is no longer than the shortest of the +variables in the set (ignoring trailing spaces). + +@item +CATEGORYLABELS optionally specifies the source of the labels for each +category in the set: + +@itemize @minus +@item +VARLABELS, the default, uses variable labels or, for variables without +variable labels, variable names. PSPP warns if two variables have the +same variable label, since these categories cannot be distinguished in +output. + +@item +COUNTEDVALUES instead uses each variable's value label for the counted +value. PSPP warns if two variables have the same value label for the +counted value or if one of the variables lacks a value label, since +such categories cannot be distinguished in output. +@end itemize + +@item +LABEL optionally specifies a label for the multiple response set. If +neither LABEL nor LABELSOURCE=VARLABEL is specified, the set is +unlabeled. + +@item +LABELSOURCE=VARLABEL draws the multiple response set's label from the +first variable label among the variables in the set; if none of the +variables has a label, the name of the first variable is used. +LABELSOURCE=VARLABEL must be used with CATEGORYLABELS=COUNTEDVALUES. +It is mutually exclusive with LABEL. +@end itemize + +The MCGROUP subcommand creates a new multiple category set or +replaces an existing multiple response set. The NAME and VARIABLES +specifications are required, and LABEL is optional. Their meanings +are as described above to MDGROUP. PSPP warns if two variables in the +set have different value labels for a single value, since each of the +variables in the set should have the same possible categories. + +The DELETE subcommand deletes multiple response groups. A list of +groups may be named within a set of required square brackets, or ALL +may be used to delete all groups. + +The DISPLAY subcommand displays information about defined multiple +response sets. Its syntax is the same as the DELETE subcommand. + +Multiple response sets are saved to and read from system files by, +e.g., the @cmd{SAVE} and @cmd{GET} command. Otherwise, multiple +response sets are currently used only by third party software. + @node PRINT FORMATS @section PRINT FORMATS @vindex PRINT FORMATS diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 71a7c864..00000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -## Process this file with automake to produce Makefile.in -*- makefile -*- - -EXTRA_DIST = descript.stat regress.stat regress_categorical.stat diff --git a/glade/automake.mk b/glade/automake.mk index 8e51e1f7..1f0bf0ba 100644 --- a/glade/automake.mk +++ b/glade/automake.mk @@ -15,6 +15,7 @@ libglade_psppire_la_SOURCES = \ glade/selector.c \ glade/acr.c \ glade/dictview.c \ + glade/var-view.c \ src/ui/gui/psppire-conf.c \ src/ui/gui/psppire-acr.c \ src/ui/gui/psppire-buttonbox.c \ @@ -23,7 +24,9 @@ libglade_psppire_la_SOURCES = \ src/ui/gui/psppire-dialog.c \ src/ui/gui/psppire-keypad.c \ src/ui/gui/psppire-dictview.c \ - src/ui/gui/psppire-selector.c + src/ui/gui/psppire-selector.c \ + src/ui/gui/psppire-select-dest.c \ + src/ui/gui/psppire-var-view.c dist_catalog_DATA = \ glade/psppire.xml diff --git a/glade/psppire.xml b/glade/psppire.xml index 50a03661..db8956b7 100644 --- a/glade/psppire.xml +++ b/glade/psppire.xml @@ -173,8 +173,10 @@ - - + + + + @@ -210,12 +212,33 @@ + + + + + + + + + glade_psppire_var_view_post_create + glade_psppire_var_view_get_children + glade_psppire_var_view_get_internal_child + + + + + + + + + + @@ -223,6 +246,7 @@ + diff --git a/glade/var-view.c b/glade/var-view.c new file mode 100644 index 00000000..7eb6c627 --- /dev/null +++ b/glade/var-view.c @@ -0,0 +1,83 @@ +#include + +#include +#include +#include "psppire-var-view.h" + +#include + + +/* Dummy function to keep the linker happy. + Glade never actually needs to use this return value. + */ +GType +psppire_var_ptr_get_type (void) +{ + return 0; +} + +void +glade_psppire_var_view_post_create (GladeWidgetAdaptor *adaptor, + GObject *object, + GladeCreateReason reason) +{ + GladeWidget *widget ; + + PsppireVarView *var_view = PSPPIRE_VAR_VIEW (object); + + g_return_if_fail (PSPPIRE_IS_VAR_VIEW (var_view)); + + widget = glade_widget_get_from_gobject (GTK_WIDGET (var_view)); + if (!widget) + return; + + if (reason == GLADE_CREATE_USER) + { + /* HIG complient border-width defaults on var_views */ + glade_widget_property_set (widget, "border-width", 5); + } +} + + +GtkWidget * +glade_psppire_var_view_get_internal_child (GladeWidgetAdaptor *adaptor, + PsppireVarView *var_view, + const gchar *name) +{ +#if DEBUGGING + g_print ("%s\n", __FUNCTION__); +#endif + return GTK_WIDGET (var_view); +} + + + +void +glade_psppire_var_view_set_property (GladeWidgetAdaptor *adaptor, + GObject *object, + const gchar *id, + const GValue *value) +{ +#if DEBUGGING + g_print ("%s(%p) Type=\"%s\" Id=\"%s\"\n", __FUNCTION__, object, + G_OBJECT_TYPE_NAME( object ), + id); +#endif + + GWA_GET_CLASS (GTK_TYPE_WINDOW)->set_property (adaptor, object, + id, value); +} + + +GList * +glade_psppire_var_view_get_children (GladeWidgetAdaptor *adaptor, + PsppireVarView *dv) +{ + GList *list = NULL; + + g_return_val_if_fail (PSPPIRE_IS_VAR_VIEW (dv), NULL); + + list = glade_util_container_get_all_children (GTK_CONTAINER (dv)); + + return list; +} diff --git a/lib/automake.mk b/lib/automake.mk index 6b20c674..9bde4afc 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -2,7 +2,7 @@ include $(top_srcdir)/lib/linreg/automake.mk -if WITHGUI +if HAVE_GUI include $(top_srcdir)/lib/gtk-contrib/automake.mk endif diff --git a/lib/gtk-contrib/automake.mk b/lib/gtk-contrib/automake.mk index f3cd96e2..b39bdb38 100644 --- a/lib/gtk-contrib/automake.mk +++ b/lib/gtk-contrib/automake.mk @@ -12,6 +12,5 @@ lib_gtk_contrib_libgtksheet_a_SOURCES = \ lib/gtk-contrib/gtkxpaned.h EXTRA_DIST += lib/gtk-contrib/OChangeLog \ - lib/gtk-contrib/README \ - lib/gtk-contrib/gtk-builder-convert + lib/gtk-contrib/README diff --git a/lib/gtk-contrib/gtk-builder-convert b/lib/gtk-contrib/gtk-builder-convert deleted file mode 100755 index 35b49166..00000000 --- a/lib/gtk-contrib/gtk-builder-convert +++ /dev/null @@ -1,776 +0,0 @@ -#!/usr/bin/env python -# This file was downloaded from -# http://git.gnome.org/cgit/gtk+/plain/gtk/gtk-builder-convert -# on 4 Oct 2009 -# -# -# Copyright (C) 2006-2008 Async Open Source -# Henrique Romano -# Johan Dahlin -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# TODO: -# Toolbars - -"""Usage: gtk-builder-convert [OPTION] [INPUT] [OUTPUT] -Converts Glade files into XML files which can be loaded with GtkBuilder. -The [INPUT] file is - - -w, --skip-windows Convert everything but GtkWindow subclasses. - -r, --root Convert only widget named root and its children - -h, --help display this help and exit - -When OUTPUT is -, write to standard output. - -Examples: - gtk-builder-convert preference.glade preferences.ui - -Report bugs to http://bugzilla.gnome.org/.""" - -import getopt -import os -import sys - -from xml.dom import minidom, Node - -DIALOGS = ['GtkDialog', - 'GtkFileChooserDialog', - 'GtkMessageDialog'] -WINDOWS = ['GtkWindow'] + DIALOGS - -# The subprocess is only available in Python 2.4+ -try: - import subprocess - subprocess # pyflakes -except ImportError: - subprocess = None - -def get_child_nodes(node): - assert node.tagName == 'object' - nodes = [] - for child in node.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - if child.tagName != 'child': - continue - nodes.append(child) - return nodes - -def get_properties(node): - assert node.tagName == 'object' - properties = {} - for child in node.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - if child.tagName != 'property': - continue - value = child.childNodes[0].data - properties[child.getAttribute('name')] = value - return properties - -def get_property(node, property_name): - assert node.tagName == 'object' - properties = get_properties(node) - return properties.get(property_name) - -def get_property_node(node, property_name): - assert node.tagName == 'object' - properties = {} - for child in node.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - if child.tagName != 'property': - continue - if child.getAttribute('name') == property_name: - return child - -def get_signal_nodes(node): - assert node.tagName == 'object' - signals = [] - for child in node.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - if child.tagName == 'signal': - signals.append(child) - return signals - -def get_property_nodes(node): - assert node.tagName == 'object' - properties = [] - for child in node.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - # FIXME: handle comments - if child.tagName == 'property': - properties.append(child) - return properties - -def get_accelerator_nodes(node): - assert node.tagName == 'object' - accelerators = [] - for child in node.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - if child.tagName == 'accelerator': - accelerators.append(child) - return accelerators - -def get_object_node(child_node): - assert child_node.tagName == 'child', child_node - nodes = [] - for node in child_node.childNodes: - if node.nodeType != Node.ELEMENT_NODE: - continue - if node.tagName == 'object': - nodes.append(node) - assert len(nodes) == 1, nodes - return nodes[0] - -def copy_properties(node, props, prop_dict): - assert node.tagName == 'object' - for prop_name in props: - child = get_property_node(node, prop_name) - if child is not None: - prop_dict[prop_name] = child - - return node - -class GtkBuilderConverter(object): - - def __init__(self, skip_windows, root): - self.skip_windows = skip_windows - self.root = root - self.root_objects = [] - self.objects = {} - - # - # Public API - # - - def parse_file(self, file): - self._dom = minidom.parse(file) - self._parse() - - def parse_buffer(self, buffer): - self._dom = minidom.parseString(buffer) - self._parse() - - def to_xml(self): - xml = self._dom.toprettyxml("", "") - return xml.encode('utf-8') - - # - # Private - # - - def _get_object(self, name): - return self.objects.get(name) - - def _get_objects_by_attr(self, attribute, value): - return [w for w in self._dom.getElementsByTagName("object") - if w.getAttribute(attribute) == value] - - def _create_object(self, obj_class, obj_id, template=None, properties=None): - """ - Creates a new tag. - Optionally a name template can be provided which will be used - to avoid naming collisions. - The properties dictionary can either contain string values or Node - values. If a node is provided the name of the node will be overridden - by the dictionary key. - - @param obj_class: class of the object (class tag) - @param obj_id: identifier of the object (id tag) - @param template: name template to use, for example 'button' - @param properties: dictionary of properties - @type properties: string or Node. - @returns: Newly created node of the object - """ - if template is not None: - count = 1 - while True: - obj_id = template + str(count) - widget = self._get_object(obj_id) - if widget is None: - break - - count += 1 - - obj = self._dom.createElement('object') - obj.setAttribute('class', obj_class) - obj.setAttribute('id', obj_id) - if properties: - for name, value in properties.items(): - if isinstance(value, Node): - # Reuse the node, so translatable and context still will be - # set when converting nodes. See also #509153 - prop = value - else: - prop = self._dom.createElement('property') - prop.appendChild(self._dom.createTextNode(value)) - - prop.setAttribute('name', str(name)) - obj.appendChild(prop) - self.objects[obj_id] = obj - return obj - - def _create_root_object(self, obj_class, template, properties=None): - obj = self._create_object(obj_class, None, template, properties) - self.root_objects.append(obj) - return obj - - def _parse(self): - glade_iface = self._dom.getElementsByTagName("glade-interface") - assert glade_iface, ("Badly formed XML, there is " - "no tag.") - # Rename glade-interface to interface - glade_iface[0].tagName = 'interface' - self._interface = glade_iface[0] - - # Remove glade-interface doc type - for node in self._dom.childNodes: - if node.nodeType == Node.DOCUMENT_TYPE_NODE: - if node.name == 'glade-interface': - self._dom.removeChild(node) - - # Strip unsupported tags - for tag in ['requires', 'requires-version']: - for child in self._dom.getElementsByTagName(tag): - child.parentNode.removeChild(child) - - if self.root: - self._strip_root(self.root) - - # Rename widget to object - objects = self._dom.getElementsByTagName("widget") - for node in objects: - node.tagName = "object" - - for node in objects: - self._convert(node.getAttribute("class"), node) - if self._get_object(node.getAttribute('id')) is not None: - print "WARNING: duplicate id \"" + node.getAttribute('id') + "\"" - self.objects[node.getAttribute('id')] = node - - # Convert Gazpachos UI tag - for node in self._dom.getElementsByTagName("ui"): - self._convert_ui(node) - - # Convert accessibility tag - for node in self._dom.getElementsByTagName("accessibility"): - self._convert_accessibility(node) - - # Output the newly created root objects and sort them - # by attribute id - # FIXME: Use sorted(self.root_objects, - # key=lambda n: n.getAttribute('id'), - # reverse=True): - # when we can depend on python 2.4 or higher - root_objects = self.root_objects[:] - root_objects.sort(lambda a, b: cmp(b.getAttribute('id'), - a.getAttribute('id'))) - for obj in root_objects: - self._interface.childNodes.insert(0, obj) - - def _convert(self, klass, node): - if klass == 'GtkNotebook': - self._packing_prop_to_child_attr(node, "type", "tab") - elif klass in ['GtkExpander', 'GtkFrame']: - self._packing_prop_to_child_attr( - node, "type", "label_item", "label") - elif klass == "GtkMenuBar": - self._convert_menu(node) - elif klass == "GtkMenu": - # Only convert toplevel popups - if node.parentNode == self._interface: - self._convert_menu(node, popup=True) - elif klass in WINDOWS and self.skip_windows: - self._remove_window(node) - self._default_widget_converter(node) - - def _default_widget_converter(self, node): - klass = node.getAttribute("class") - for prop in get_property_nodes(node): - prop_name = prop.getAttribute("name") - if prop_name == "sizegroup": - self._convert_sizegroup(node, prop) - elif prop_name == "tooltip" and klass != "GtkAction": - prop.setAttribute("name", "tooltip-text") - elif prop_name in ["response_id", 'response-id']: - # It does not make sense to convert responses when - # we're not going to output dialogs - if self.skip_windows: - continue - object_id = node.getAttribute('id') - response = prop.childNodes[0].data - self._convert_dialog_response(node, object_id, response) - prop.parentNode.removeChild(prop) - elif prop_name == "adjustment": - self._convert_adjustment(prop) - elif prop_name == "items" and klass in ['GtkComboBox', - 'GtkComboBoxEntry']: - self._convert_combobox_items(node, prop) - elif prop_name == "text" and klass == 'GtkTextView': - self._convert_textview_text(prop) - - def _remove_window(self, node): - object_node = get_object_node(get_child_nodes(node)[0]) - parent = node.parentNode - parent.removeChild(node) - parent.appendChild(object_node) - - def _convert_menu(self, node, popup=False): - if node.hasAttribute('constructor'): - return - - uimgr = self._create_root_object('GtkUIManager', - template='uimanager') - - if popup: - name = 'popup' - else: - name = 'menubar' - - menu = self._dom.createElement(name) - menu.setAttribute('name', node.getAttribute('id')) - node.setAttribute('constructor', uimgr.getAttribute('id')) - - for child in get_child_nodes(node): - obj_node = get_object_node(child) - item = self._convert_menuitem(uimgr, obj_node) - menu.appendChild(item) - child.removeChild(obj_node) - child.parentNode.removeChild(child) - - ui = self._dom.createElement('ui') - uimgr.appendChild(ui) - - ui.appendChild(menu) - - def _convert_menuitem(self, uimgr, obj_node): - children = get_child_nodes(obj_node) - name = 'menuitem' - if children: - child_node = children[0] - menu_node = get_object_node(child_node) - # Can be GtkImage, which will take care of later. - if menu_node.getAttribute('class') == 'GtkMenu': - name = 'menu' - - object_class = obj_node.getAttribute('class') - if object_class in ['GtkMenuItem', - 'GtkImageMenuItem', - 'GtkCheckMenuItem', - 'GtkRadioMenuItem']: - menu = self._dom.createElement(name) - elif object_class == 'GtkSeparatorMenuItem': - return self._dom.createElement('separator') - else: - raise NotImplementedError(object_class) - - menu.setAttribute('action', obj_node.getAttribute('id')) - self._add_action_from_menuitem(uimgr, obj_node) - if children: - for child in get_child_nodes(menu_node): - obj_node = get_object_node(child) - item = self._convert_menuitem(uimgr, obj_node) - menu.appendChild(item) - child.removeChild(obj_node) - child.parentNode.removeChild(child) - return menu - - def _menuitem_to_action(self, node, properties): - copy_properties(node, ['label', 'tooltip'], properties) - - def _togglemenuitem_to_action(self, node, properties): - self._menuitem_to_action(node, properties) - copy_properties(node, ['active'], properties) - - def _radiomenuitem_to_action(self, node, properties): - self._togglemenuitem_to_action(node, properties) - copy_properties(node, ['group'], properties) - - def _add_action_from_menuitem(self, uimgr, node): - properties = {} - object_class = node.getAttribute('class') - object_id = node.getAttribute('id') - if object_class == 'GtkMenuItem': - name = 'GtkAction' - self._menuitem_to_action(node, properties) - elif object_class == 'GtkCheckMenuItem': - name = 'GtkToggleAction' - self._togglemenuitem_to_action(node, properties) - elif object_class == 'GtkRadioMenuItem': - name = 'GtkRadioAction' - self._radiomenuitem_to_action(node, properties) - elif object_class == 'GtkImageMenuItem': - name = 'GtkAction' - children = get_child_nodes(node) - if (children and - children[0].getAttribute('internal-child') == 'image'): - image = get_object_node(children[0]) - child = get_property_node(image, 'stock') - if child is not None: - properties['stock_id'] = child - self._menuitem_to_action(node, properties) - elif object_class == 'GtkSeparatorMenuItem': - return - else: - raise NotImplementedError(object_class) - - if get_property(node, 'use_stock') == 'True': - if 'label' in properties: - properties['stock_id'] = properties['label'] - del properties['label'] - - properties['name'] = object_id - action = self._create_object(name, - object_id, - properties=properties) - for signal in get_signal_nodes(node): - signal_name = signal.getAttribute('name') - if signal_name in ['activate', 'toggled']: - action.appendChild(signal) - else: - print 'Unhandled signal %s::%s' % (node.getAttribute('class'), - signal_name) - - if not uimgr.childNodes: - child = self._dom.createElement('child') - uimgr.appendChild(child) - - group = self._create_object('GtkActionGroup', None, - template='actiongroup') - child.appendChild(group) - else: - group = uimgr.childNodes[0].childNodes[0] - - child = self._dom.createElement('child') - group.appendChild(child) - child.appendChild(action) - - for accelerator in get_accelerator_nodes(node): - signal_name = accelerator.getAttribute('signal') - if signal_name != 'activate': - print 'Unhandled accelerator signal for %s::%s' % ( - node.getAttribute('class'), signal_name) - continue - accelerator.removeAttribute('signal') - child.appendChild(accelerator) - - def _convert_sizegroup(self, node, prop): - # This is Gazpacho only - node.removeChild(prop) - obj = self._get_object(prop.childNodes[0].data) - if obj is None: - widgets = self._get_objects_by_attr("class", "GtkSizeGroup") - if widgets: - obj = widgets[-1] - else: - obj = self._create_root_object('GtkSizeGroup', - template='sizegroup') - - widgets = obj.getElementsByTagName("widgets") - if widgets: - assert len(widgets) == 1 - widgets = widgets[0] - else: - widgets = self._dom.createElement("widgets") - obj.appendChild(widgets) - - member = self._dom.createElement("widget") - member.setAttribute("name", node.getAttribute("id")) - widgets.appendChild(member) - - def _convert_dialog_response(self, node, object_name, response): - # 1) Get parent dialog node - while True: - # If we can't find the parent dialog, give up - if node == self._dom: - return - - if (node.tagName == 'object' and - node.getAttribute('class') in DIALOGS): - dialog = node - break - node = node.parentNode - assert node - - # 2) Get dialogs action-widgets tag, create if not found - for child in dialog.childNodes: - if child.nodeType != Node.ELEMENT_NODE: - continue - if child.tagName == 'action-widgets': - actions = child - break - else: - actions = self._dom.createElement("action-widgets") - dialog.appendChild(actions) - - # 3) Add action-widget tag for the response - action = self._dom.createElement("action-widget") - action.setAttribute("response", response) - action.appendChild(self._dom.createTextNode(object_name)) - actions.appendChild(action) - - def _convert_adjustment(self, prop): - properties = {} - if prop.childNodes: - data = prop.childNodes[0].data - value, lower, upper, step, page, page_size = data.split(' ') - properties.update(value=value, - lower=lower, - upper=upper, - step_increment=step, - page_increment=page, - page_size=page_size) - else: - prop.appendChild(self._dom.createTextNode("")) - - adj = self._create_root_object("GtkAdjustment", - template='adjustment', - properties=properties) - prop.childNodes[0].data = adj.getAttribute('id') - - def _convert_combobox_items(self, node, prop): - parent = prop.parentNode - if not prop.childNodes: - parent.removeChild(prop) - return - - translatable_attr = prop.attributes.get('translatable') - translatable = translatable_attr is not None and translatable_attr.value == 'yes' - has_context_attr = prop.attributes.get('context') - has_context = has_context_attr is not None and has_context_attr.value == 'yes' - comments_attr = prop.attributes.get('comments') - comments = comments_attr is not None and comments_attr.value or None - - value = prop.childNodes[0].data - model = self._create_root_object("GtkListStore", - template="model") - - columns = self._dom.createElement('columns') - model.appendChild(columns) - - column = self._dom.createElement('column') - column.setAttribute('type', 'gchararray') - columns.appendChild(column) - - data = self._dom.createElement('data') - model.appendChild(data) - - if value.endswith('\n'): - value = value[:-1] - for item in value.split('\n'): - row = self._dom.createElement('row') - data.appendChild(row) - - col = self._dom.createElement('col') - col.setAttribute('id', '0') - if translatable: - col.setAttribute('translatable', 'yes') - if has_context: - splitting = item.split('|', 1) - if len(splitting) == 2: - context, item = splitting - col.setAttribute('context', context) - if comments is not None: - col.setAttribute('comments', comments) - col.appendChild(self._dom.createTextNode(item)) - row.appendChild(col) - - model_prop = self._dom.createElement('property') - model_prop.setAttribute('name', 'model') - model_prop.appendChild( - self._dom.createTextNode(model.getAttribute('id'))) - parent.appendChild(model_prop) - - parent.removeChild(prop) - - child = self._dom.createElement('child') - node.appendChild(child) - cell_renderer = self._create_object('GtkCellRendererText', None, - template='renderer') - child.appendChild(cell_renderer) - - attributes = self._dom.createElement('attributes') - child.appendChild(attributes) - - attribute = self._dom.createElement('attribute') - attributes.appendChild(attribute) - attribute.setAttribute('name', 'text') - attribute.appendChild(self._dom.createTextNode('0')) - - def _convert_textview_text(self, prop): - if not prop.childNodes: - prop.parentNode.removeChild(prop) - return - - data = prop.childNodes[0].data - if prop.hasAttribute('translatable'): - prop.removeAttribute('translatable') - tbuffer = self._create_root_object("GtkTextBuffer", - template='textbuffer', - properties=dict(text=data)) - prop.childNodes[0].data = tbuffer.getAttribute('id') - prop.setAttribute('name', 'buffer') - - def _packing_prop_to_child_attr(self, node, prop_name, prop_val, - attr_val=None): - for child in get_child_nodes(node): - packing_props = [p for p in child.childNodes if p.nodeName == "packing"] - if not packing_props: - continue - assert len(packing_props) == 1 - packing_prop = packing_props[0] - properties = packing_prop.getElementsByTagName("property") - for prop in properties: - if (prop.getAttribute("name") != prop_name or - prop.childNodes[0].data != prop_val): - continue - packing_prop.removeChild(prop) - child.setAttribute(prop_name, attr_val or prop_val) - if len(properties) == 1: - child.removeChild(packing_prop) - - def _convert_ui(self, node): - cdata = node.childNodes[0] - data = cdata.toxml().strip() - if not data.startswith(""): - return - data = data[9:-3] - child = minidom.parseString(data).childNodes[0] - nodes = child.childNodes[:] - for child_node in nodes: - node.appendChild(child_node) - node.removeChild(cdata) - if not node.hasAttribute("id"): - return - - # Updating references made by widgets - parent_id = node.parentNode.getAttribute("id") - for widget in self._get_objects_by_attr("constructor", - node.getAttribute("id")): - widget.getAttributeNode("constructor").value = parent_id - node.removeAttribute("id") - - def _convert_accessibility(self, node): - objectNode = node.parentNode - parent_id = objectNode.getAttribute("id") - - properties = {} - for node in node.childNodes: - if node.nodeName == 'atkproperty': - node.tagName = 'property' - properties[node.getAttribute('name')] = node - node.parentNode.removeChild(node) - elif node.nodeName == 'atkrelation': - node.tagName = 'relation' - relation_type = node.getAttribute('type') - relation_type = relation_type.replace('_', '-') - node.setAttribute('type', relation_type) - elif node.nodeName == 'atkaction': - node.tagName = 'action' - - if properties: - child = self._dom.createElement('child') - child.setAttribute("internal-child", "accessible") - - atkobject = self._create_object( - "AtkObject", None, - template='a11y-%s' % (parent_id,), - properties=properties) - child.appendChild(atkobject) - objectNode.appendChild(child) - - def _strip_root(self, root_name): - for widget in self._dom.getElementsByTagName("widget"): - if widget.getAttribute('id') == root_name: - break - else: - raise SystemExit("Could not find an object called `%s'" % ( - root_name)) - - for child in self._interface.childNodes[:]: - if child.nodeType != Node.ELEMENT_NODE: - continue - child.parentNode.removeChild(child) - - self._interface.appendChild(widget) - - -def _indent(output): - if not subprocess: - return output - - for directory in os.environ['PATH'].split(os.pathsep): - filename = os.path.join(directory, 'xmllint') - if os.path.exists(filename): - break - else: - return output - - s = subprocess.Popen([filename, '--format', '-'], - stdin=subprocess.PIPE, - stdout=subprocess.PIPE) - s.stdin.write(output) - s.stdin.close() - return s.stdout.read() - -def usage(): - print __doc__ - -def main(args): - try: - opts, args = getopt.getopt(args[1:], "hwr:", - ["help", "skip-windows", "root="]) - except getopt.GetoptError: - usage() - return 2 - - if len(args) != 2: - usage() - return 2 - - input_filename, output_filename = args - - skip_windows = False - split = False - root = None - for o, a in opts: - if o in ("-h", "--help"): - usage() - sys.exit() - elif o in ("-r", "--root"): - root = a - elif o in ("-w", "--skip-windows"): - skip_windows = True - - conv = GtkBuilderConverter(skip_windows=skip_windows, - root=root) - conv.parse_file(input_filename) - - xml = _indent(conv.to_xml()) - if output_filename == "-": - print xml - else: - open(output_filename, 'w').write(xml) - print "Wrote", output_filename - - return 0 - -if __name__ == "__main__": - sys.exit(main(sys.argv)) diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c index 6d1c0af9..b4861713 100644 --- a/lib/gtk-contrib/psppire-sheet.c +++ b/lib/gtk-contrib/psppire-sheet.c @@ -1391,7 +1391,7 @@ psppire_sheet_set_model (PsppireSheet *sheet, PsppireSheetModel *model) void -psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type) +psppire_sheet_change_entry (PsppireSheet *sheet, GType entry_type) { g_return_if_fail (sheet != NULL); g_return_if_fail (PSPPIRE_IS_SHEET (sheet)); @@ -3022,9 +3022,7 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column) sheet->range.row0 = 0; sheet->range.col0 = 0; sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1; - sheet->range.coli = - psppire_axis_unit_count (sheet->haxis) - 1; - psppire_sheet_select_range (sheet, NULL); + sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1; return TRUE; } diff --git a/lib/gtk-contrib/psppire-sheet.h b/lib/gtk-contrib/psppire-sheet.h index db58d4bd..eccffe84 100644 --- a/lib/gtk-contrib/psppire-sheet.h +++ b/lib/gtk-contrib/psppire-sheet.h @@ -65,11 +65,12 @@ enum #define PSPPIRE_TYPE_SHEET_RANGE (psppire_sheet_range_get_type ()) #define PSPPIRE_TYPE_SHEET_CELL (psppire_sheet_cell_get_type ()) -#define PSPPIRE_TYPE_SHEET (psppire_sheet_get_type ()) -#define PSPPIRE_SHEET(obj) GTK_CHECK_CAST (obj, psppire_sheet_get_type (), PsppireSheet) -#define PSPPIRE_SHEET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, psppire_sheet_get_type (), PsppireSheetClass) -#define PSPPIRE_IS_SHEET(obj) GTK_CHECK_TYPE (obj, psppire_sheet_get_type ()) + +#define PSPPIRE_TYPE_SHEET (psppire_sheet_get_type ()) +#define PSPPIRE_SHEET(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_TYPE_SHEET, PsppireSheet) +#define PSPPIRE_SHEET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_TYPE_SHEET, PsppireSheetClass) +#define PSPPIRE_IS_SHEET(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_TYPE_SHEET) typedef struct _PsppireSheetClass PsppireSheetClass; @@ -123,7 +124,7 @@ struct _PsppireSheet GtkWidget *entry_widget; /* The type of entry_widget */ - GtkType entry_type; + GType entry_type; /* global selection button */ GtkWidget *button; @@ -224,7 +225,7 @@ struct _PsppireSheetClass }; GType psppire_sheet_get_type (void); -GtkType psppire_sheet_range_get_type (void); +GType psppire_sheet_range_get_type (void); /* create a new sheet */ @@ -232,10 +233,10 @@ GtkWidget * psppire_sheet_new (PsppireSheetModel *model); /* create a new sheet with custom entry */ GtkWidget * -psppire_sheet_new_with_custom_entry (GtkType entry_type); +psppire_sheet_new_with_custom_entry (GType entry_type); /* Change entry */ -void psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type); +void psppire_sheet_change_entry (PsppireSheet *sheet, GType entry_type); GtkEntry *psppire_sheet_get_entry (PsppireSheet *sheet); diff --git a/perl-module/Makefile.PL b/perl-module/Makefile.PL index 045b4e76..56b8a930 100644 --- a/perl-module/Makefile.PL +++ b/perl-module/Makefile.PL @@ -12,7 +12,7 @@ do 'pspp-module-config' || do { }; WriteMakefile( - FULLPERL => "PSPP_TEST_CMD=\"$Locations{BuildDir}/src/ui/terminal/pspp -B $Locations{SourceDir}/config\" \$(PERL)", + FULLPERL => "PSPP_TEST_CMD=\"$Locations{BuildDir}/src/ui/terminal/pspp\" \$(PERL)", NAME => 'PSPP', DISTNAME => 'PSPP-Perl', VERSION_FROM => "$Locations{BuildDir}/src/libpspp/version.c", diff --git a/perl-module/PSPP.xs b/perl-module/PSPP.xs index 77a720ca..ca3f873a 100644 --- a/perl-module/PSPP.xs +++ b/perl-module/PSPP.xs @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010 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 @@ -19,6 +19,12 @@ #include +/* The Gnulib "strftime" module defines my_strftime in for use by + gl/strftime.c. Perl also defines my_strftime in embed.h for some other + purpose. The former definition doesn't matter in this file, so suppress it + to avoid a compiler warning. */ +#undef my_strftime + #include "EXTERN.h" #include "perl.h" #include "XSUB.h" @@ -181,11 +187,10 @@ format_value (val, var) CODE: SV *ret; const struct fmt_spec *fmt = var_get_print_format (var); - const struct dictionary *dict = var_get_vardict (var)->dict; union value uv; char *s; make_value_from_scalar (&uv, val, var); - s = data_out (&uv, dict_get_encoding (dict), fmt); + s = data_out (&uv, var_get_encoding (var), fmt); value_destroy (&uv, var_get_width (var)); ret = newSVpv (s, fmt->w); free (s); @@ -584,6 +589,7 @@ CODE: struct file_handle *fh = fh_create_file (NULL, name, fh_default_properties () ); struct sysfile_info *sfi = xmalloc (sizeof (*sfi)); + dict_set_encoding (dict, "UTF-8"); sfi->writer = sfm_open_writer (fh, dict, opts); sfi->dict = dict; sfi->opened = true; diff --git a/perl-module/README b/perl-module/README index c8e94846..7c44cf39 100644 --- a/perl-module/README +++ b/perl-module/README @@ -7,8 +7,9 @@ system files. INSTALLATION To install you must have first installed and built pspp 0.7.2 or -later. Pspp is not required to use this module, only to install -it. +later. The Perl module does not use the installed PSPP binaries, but +it does require the libpspp-core-$VERSION.so library installed with +PSPP (see below). To install this module type the following: @@ -34,7 +35,7 @@ required during installation, but are not needed to run the module. COPYRIGHT AND LICENCE -Copyright (C) 2007, 2009 by Free Software Foundation +Copyright (C) 2007, 2009, 2010 by Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/perl-module/automake.mk b/perl-module/automake.mk index 819df652..c442d04e 100644 --- a/perl-module/automake.mk +++ b/perl-module/automake.mk @@ -27,13 +27,14 @@ perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix) perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) - $(RM) $@ + rm -f $@ cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist PHONY += module-make module-make: perl-module/Makefile src/libpspp-core.la cd perl-module && $(MAKE) $(AM_MAKEFLAGS) +ALL_LOCAL += perl_module_tarball perl_module_tarball: if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \ for f in $(module_sources); do \ @@ -47,21 +48,13 @@ perl_module_tarball: fi $(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz -ALL_LOCAL += perl_module_tarball - -check-local: - loc=`pwd` ; cd $(top_builddir)/src/.libs ; llp=`pwd` ; cd $$loc ; \ - LANG=C LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test" - - -perl_module_CLEAN: +CLEAN_LOCAL += perl_module_clean +perl_module_clean: cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \ - $(RM) $(module_sources) ; \ + rm -f $(module_sources) ; \ fi - $(RM) perl-module/Makefile.old - -CLEAN_LOCAL += perl_module_CLEAN + rm -f perl-module/Makefile.old CLEANFILES += \ perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz \ diff --git a/perl-module/lib/PSPP.pm b/perl-module/lib/PSPP.pm deleted file mode 100644 index e5599908..00000000 --- a/perl-module/lib/PSPP.pm +++ /dev/null @@ -1,560 +0,0 @@ -use 5.008008; -use strict; -use warnings; - -=head1 NAME - -PSPP-Perl - Perl extension to PSPP - -=head1 SYNOPSIS - - use PSPP; - -=head1 DESCRIPTION - -PSPP-Perl provides an interface to the libraries used by pspp to read and -write system files. - -=head1 EXPORT - -None by default. - -=cut -BEGIN { - $PSPP::VERSION='0.7.2'; - require XSLoader; - XSLoader::load('PSPP', $PSPP::VERSION); -} - -PSPP::onBoot($PSPP::VERSION); - -=pod - -=head1 PROGRAMMER'S INTERFACE - -The subroutines in this package return zero or unref on error. -When errors occur, a string describing the error is written -to C<$PSPP::errstr>. - -=cut - -package PSPP; -use POSIX ; - -use constant { SYSMIS => -(POSIX::DBL_MAX), - PERL_EPOCH => 12219379200 # Number of seconds between - # 14th October 1582 - # and - # 1st January 1970 - }; - - - -package PSPP::Dict; - -=pod - -=head2 PSPP::Dict::new - -Creates a new dictionary. This returned dictionary will be empty. -Returns undef on failure. - -=head3 set_documents ($string) - -Sets the documents (comments) to C. - -=head3 add_document ($string) - -Appends C to the documents. - -=head3 clear_documents () - -Removes all documents. - -=head3 set_weight ($var) - -Sets the weighting variable to C. - -=cut - -sub new -{ - my $class = shift; - my $self = pxs_dict_new (); - bless ($self, $class); - return $self; -} - -=pod - -=head3 get_var_cnt () - -Returns the number of variables in the dictionary. - -=head3 get_var ($idx) - -Returns the Cth variable from the dictionary. -Returns undef if C is greater than or equal to the number -of variables in the dictionary. - -=cut - -sub get_var -{ - my $dict = shift; - my $idx = shift; - my $var = pxs_get_variable ($dict, $idx); - - if ( ref $var ) - { - bless ($var, "PSPP::Var"); - } - return $var; -} - -=pod - -=head3 get_var_by_name ($name) - -Returns the variable from the dictionary whose name is C. -If there is no such variable, a null reference will be returned. - -=cut - -sub get_var_by_name -{ - my $dict = shift; - my $name = shift; - my $var = pxs_get_var_by_name ($dict, $name); - - if ( ref $var ) - { - bless ($var, "PSPP::Var"); - } - return $var; -} - - -package PSPP::Fmt; - -=pod - -=head2 PSPP::Fmt - -Contains constants used to denote variable format types. -The identifiers are the same as those used in pspp to denote formats. -For example C defines floating point format, and -C denotes string format. - -=cut - -# These must correspond to the values in src/data/format.h -use constant { - F => 0, - COMMA => 1, - DOT => 2, - DOLLAR => 3, - PCT => 4, - E => 5, - CCA => 6, - CCB => 7, - CCC => 8, - CCD => 9, - CCE => 10, - N => 11, - Z => 12, - P => 13, - PK => 14, - IB => 15, - PIB => 16, - PIBHEX => 17, - RB => 18, - RBHEX => 19, - DATE => 20, - ADATE => 21, - EDATE => 22, - JDATE => 23, - SDATE => 24, - QYR => 25, - MOYR => 26, - WKYR => 27, - DATETIME => 28, - TIME => 29, - DTIME => 30, - WKDAY => 31, - MONTH => 32, - A => 33, - AHEX => 34 -}; - - -=head2 PSPP::Var - -=cut - -package PSPP::Var; - -=head3 new ($dict, $name, %input_fmt) - -Creates and returns a new variable in the dictionary C. The -new variable will have the name C. -The input format is set by the C parameter -(See L). -By default, the write and print formats are the same as the input format. -The write and print formats may be changed (See L), -L). The input format may not be changed after -the variable has been created. -If the variable cannot be created, undef is returned. - -=cut - -sub new -{ - my $class = shift; - my $dict = shift; - my $name = shift; - my %format = @_; - my $self = pxs_dict_create_var ($dict, $name, \%format); - if ( ref $self ) - { - bless ($self, $class); - } - return $self; -} - -=pod - -=head3 set_label ($label) - -Sets the variable label to C