diff options
| -rw-r--r-- | ABOUT-NLS | 2393 | ||||
| -rw-r--r-- | COPYING | 674 | ||||
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | INSTALL | 377 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 56 | ||||
| -rw-r--r-- | aclocal.m4 | 66 | ||||
| -rwxr-xr-x | ar-lib | 270 | ||||
| -rwxr-xr-x[-rw-r--r--] | compile | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | config.guess | 354 | ||||
| -rw-r--r-- | config.h.in | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | config.rpath | 18 | ||||
| -rwxr-xr-x[-rw-r--r--] | config.sub | 88 | ||||
| -rwxr-xr-x | configure | 1271 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rwxr-xr-x[-rw-r--r--] | depcomp | 2 | ||||
| -rw-r--r-- | doc/Changelog | 16 | ||||
| -rw-r--r-- | doc/Makefile.in | 28 | ||||
| -rw-r--r-- | doc/Readme | 5 | ||||
| -rw-r--r-- | doc/TODO | 4 | ||||
| -rw-r--r-- | doc/daisy-player.description | 45 | ||||
| -rw-r--r-- | doc/daisy-player.html | 16 | ||||
| -rw-r--r-- | doc/daisy-player.txt | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | install-sh | 373 | ||||
| -rw-r--r-- | m4/Makefile.in | 26 | ||||
| -rw-r--r-- | m4/gettext.m4 | 12 | ||||
| -rw-r--r-- | m4/iconv.m4 | 63 | ||||
| -rw-r--r-- | m4/intlmacosx.m4 | 25 | ||||
| -rw-r--r-- | m4/lib-ld.m4 | 2 | ||||
| -rw-r--r-- | m4/lib-link.m4 | 2 | ||||
| -rw-r--r-- | m4/lib-prefix.m4 | 2 | ||||
| -rw-r--r-- | m4/nls.m4 | 6 | ||||
| -rw-r--r-- | m4/po.m4 | 10 | ||||
| -rw-r--r-- | m4/progtest.m4 | 6 | ||||
| -rw-r--r-- | man/Makefile.am | 14 | ||||
| -rw-r--r-- | man/Makefile.in | 39 | ||||
| -rw-r--r-- | man/daisy-player.1 | 16 | ||||
| -rwxr-xr-x | mdate-sh | 228 | ||||
| -rwxr-xr-x[-rw-r--r--] | missing | 2 | ||||
| -rwxr-xr-x | mkinstalldirs | 162 | ||||
| -rw-r--r-- | po/ChangeLog | 5 | ||||
| -rw-r--r-- | po/LINGUAS | 2 | ||||
| -rw-r--r-- | po/Makefile.in.in | 84 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | po/Rules-quot | 15 | ||||
| -rw-r--r-- | po/af.gmo | bin | 5579 -> 6664 bytes | |||
| -rw-r--r-- | po/af.po | 266 | ||||
| -rw-r--r-- | po/daisy-player.pot | 197 | ||||
| -rw-r--r-- | po/de.gmo | bin | 5459 -> 6711 bytes | |||
| -rw-r--r-- | po/de.po | 232 | ||||
| -rw-r--r-- | po/en@boldquot.gmo | bin | 5577 -> 6427 bytes | |||
| -rw-r--r-- | po/en@boldquot.po | 223 | ||||
| -rw-r--r-- | po/en@quot.gmo | bin | 5557 -> 6391 bytes | |||
| -rw-r--r-- | po/en@quot.po | 223 | ||||
| -rw-r--r-- | po/es.gmo | bin | 5853 -> 0 bytes | |||
| -rw-r--r-- | po/es_ES.utf8.gmo | bin | 0 -> 6755 bytes | |||
| -rw-r--r-- | po/es_ES.utf8.po (renamed from po/es.po) | 229 | ||||
| -rw-r--r-- | po/es_GT.utf8.gmo | bin | 0 -> 6851 bytes | |||
| -rw-r--r-- | po/es_GT.utf8.po | 301 | ||||
| -rw-r--r-- | po/fi.gmo | bin | 0 -> 6614 bytes | |||
| -rw-r--r-- | po/fi.po | 300 | ||||
| -rw-r--r-- | po/fr.gmo | bin | 5886 -> 6859 bytes | |||
| -rw-r--r-- | po/fr.po | 304 | ||||
| -rw-r--r-- | po/hu.gmo | bin | 5847 -> 7291 bytes | |||
| -rw-r--r-- | po/hu.po | 318 | ||||
| -rw-r--r-- | po/ml.gmo | bin | 0 -> 8897 bytes | |||
| -rw-r--r-- | po/ml.po | 296 | ||||
| -rw-r--r-- | po/nb.gmo | bin | 5510 -> 6722 bytes | |||
| -rw-r--r-- | po/nb.po | 254 | ||||
| -rw-r--r-- | po/nl.gmo | bin | 5718 -> 6570 bytes | |||
| -rw-r--r-- | po/nl.po | 223 | ||||
| -rw-r--r-- | po/pl.gmo | bin | 5654 -> 6820 bytes | |||
| -rw-r--r-- | po/pl.po | 218 | ||||
| -rw-r--r-- | po/pt.gmo | bin | 5701 -> 6829 bytes | |||
| -rw-r--r-- | po/pt.po | 218 | ||||
| -rw-r--r-- | po/sl.gmo | bin | 5879 -> 6746 bytes | |||
| -rw-r--r-- | po/sl.po | 218 | ||||
| -rw-r--r-- | po/sv.gmo | bin | 5624 -> 6505 bytes | |||
| -rw-r--r-- | po/sv.po | 216 | ||||
| -rwxr-xr-x | py-compile | 170 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 42 | ||||
| -rw-r--r-- | src/audiocd.c | 10 | ||||
| -rw-r--r-- | src/common.c | 1221 | ||||
| -rw-r--r-- | src/daisy-player.c | 1784 | ||||
| -rw-r--r-- | src/daisy.h | 100 | ||||
| -rw-r--r-- | src/daisy2.02.c | 273 | ||||
| -rw-r--r-- | src/daisy3.c | 1833 | ||||
| -rw-r--r-- | src/gettext.h | 11 | ||||
| -rw-r--r-- | src/paranoia.c | 12 | ||||
| -rw-r--r-- | texinfo.tex | 10079 | ||||
| -rwxr-xr-x | ylwrap | 247 |
92 files changed, 21743 insertions, 5112 deletions
@@ -1,16 +1,16 @@ 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 +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, + 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 +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 @@ -23,12 +23,12 @@ work on translations can contact the appropriate team. 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'. +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. Installers may use special +provides the GNU 'gettext' functions. Installers may use special options at configuration time for changing the default behaviour. The command: @@ -36,72 +36,71 @@ command: will _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' library -and will decide to use it. If not, you may have to to use the -`--with-libintl-prefix' option to tell `configure' where to look for it. + 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' library and +will decide to use it. If not, you may have to to use the +'--with-libintl-prefix' option to tell 'configure' where to look for it. - Internationalized packages usually have many `po/LL.po' files, where + 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' +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 +'LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. 1.2 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. +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 +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''. + 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' +'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'. +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 +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 +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. + 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.3 Translating Teams ===================== @@ -111,22 +110,22 @@ 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. +'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: +'-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. + 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 @@ -136,1114 +135,1214 @@ programming skills, here. ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of June -2010. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of Jun 2014. +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 an ar as ast az be be@latin bg bn_IN bs ca + Ready PO files af am an ar as ast az be bg bn bn_IN bs ca crh cs + +---------------------------------------------------+ + a2ps | [] [] [] | + aegis | | + anubis | | + aspell | [] [] [] | + bash | [] [] [] | + bfd | | + binutils | [] | + bison | | + bison-runtime | [] | + buzztrax | [] | + ccd2cue | | + ccide | | + cflow | | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | [] | + datamash | | + denemo | [] [] | + dfarc | [] | + dialog | [] [] [] | + dico | | + diffutils | [] | + dink | [] | + direvent | | + doodle | [] | + dos2unix | | + dos2unix-man | | + e2fsprogs | [] [] | + enscript | [] | + exif | [] | + fetchmail | [] [] | + findutils | [] | + flex | [] | + freedink | [] [] | + fusionforge | | + gas | | + gawk | [] | + gcal | [] | + gcc | | + gdbm | | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gjay | | + glunarclock | [] [] [] | + gnubiff | [] | + gnubik | [] | + gnucash | () () [] | + gnuchess | | + gnulib | [] | + gnunet | | + gnunet-gtk | | + gold | | + gphoto2 | [] | + gprof | [] | + gramadoir | | + grep | [] [] [] | + grub | [] | + gsasl | | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] [] [] | + gst-plugins-good | [] [] [] | + gst-plugins-ugly | [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] | + gtkam | [] [] | + gtkspell | [] [] [] [] [] | + guix | | + guix-packages | | + gutenprint | [] | + hello | [] | + help2man | | + help2man-texi | | + hylafax | | + idutils | | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + iso_639_5 | | + jwhois | | + kbd | [] | + klavaro | [] [] [] [] [] | + latrine | | + ld | [] | + leafpad | [] [] [] [] | + libc | [] [] [] | + libexif | () | + libextractor | | + libgnutls | [] | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | | + libiconv | [] [] | + libidn | [] | + liferea | [] [] [] [] | + lilypond | [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] | + m4 | [] | + mailfromd | | + mailutils | | + make | [] | + man-db | [] [] | + man-db-manpages | | + midi-instruments | [] [] [] | + minicom | [] | + mkisofs | [] | + myserver | [] | + nano | [] [] [] | + opcodes | | + parted | [] | + pies | | + popt | [] | + procps-ng | | + procps-ng-man | | + psmisc | [] | + pspp | [] | + pushover | [] | + pwdutils | | + pyspread | | + radius | [] | + recode | [] [] [] | + recutils | | + rpm | | + rush | | + sarg | | + sed | [] [] [] | + sharutils | [] | + shishi | | + skribilo | | + solfege | [] | + solfege-manual | | + spotmachine | | + sudo | [] [] | + sudoers | [] [] | + sysstat | [] | + tar | [] [] [] | + texinfo | [] [] | + texinfo_document | [] | + tigervnc | [] | + tin | | + tin-man | | + tracgoogleappsa... | | + trader | | + util-linux | [] | + ve | | + vice | | + vmm | | + vorbis-tools | [] | + wastesedge | | + wcd | | + wcd-man | | + wdiff | [] [] | + wget | [] | + wyslij-po | | + xboard | | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + af am an ar as ast az be bg bn bn_IN bs ca crh cs + 4 0 2 5 3 11 0 8 23 3 3 1 54 4 73 + + da de el en en_GB en_ZA eo es et eu fa fi fr + +--------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] [] | + aegis | [] [] [] [] | + anubis | [] [] [] [] [] | + aspell | [] [] [] [] [] [] [] | + bash | [] [] [] | + bfd | [] [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] [] [] [] [] | + bison-runtime | [] [] [] [] [] [] [] [] | + buzztrax | [] [] [] [] | + ccd2cue | [] [] [] | + ccide | [] [] [] [] [] [] | + cflow | [] [] [] [] [] | + clisp | [] [] [] [] [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] [] [] | + cppi | [] [] [] [] [] | + cpplib | [] [] [] [] [] [] | + cryptsetup | [] [] [] [] [] | + datamash | [] [] [] [] | + denemo | [] | + dfarc | [] [] [] [] [] [] | + dialog | [] [] [] [] [] [] [] [] [] | + dico | [] [] [] [] | + diffutils | [] [] [] [] [] [] | + dink | [] [] [] [] [] [] | + direvent | [] [] [] [] | + doodle | [] [] [] [] | + dos2unix | [] [] [] [] [] | + dos2unix-man | [] [] [] | + e2fsprogs | [] [] [] [] [] | + enscript | [] [] [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] () [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] [] [] [] | + freedink | [] [] [] [] [] [] [] [] | + fusionforge | [] [] [] | + gas | [] [] [] | + gawk | [] [] [] [] [] | + gcal | [] [] [] [] | + gcc | [] [] | + gdbm | [] [] [] [] [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] | + gjay | [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | () [] [] () | + gnubik | [] [] [] [] [] | + gnucash | [] () () () () () () | + gnuchess | [] [] [] [] | + gnulib | [] [] [] [] [] [] [] | + gnunet | [] | + gnunet-gtk | [] | + gold | [] [] [] | + gphoto2 | [] () [] [] | + gprof | [] [] [] [] [] [] | + gramadoir | [] [] [] [] [] | + grep | [] [] [] [] [] [] [] | + grub | [] [] [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] [] | + gtick | [] () [] [] [] | + gtkam | [] () [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + guix | [] [] | + guix-packages | | + gutenprint | [] [] [] [] | + hello | [] [] [] [] [] [] [] [] | + help2man | [] [] [] [] [] [] [] | + help2man-texi | [] [] [] | + hylafax | [] [] | + idutils | [] [] [] [] [] | + iso_15924 | [] () [] [] () [] () | + iso_3166 | [] () [] [] [] [] () [] () | + iso_3166_2 | [] () () () | + iso_4217 | [] () [] [] [] () [] () | + iso_639 | [] () [] [] () [] () | + iso_639_3 | () () () | + iso_639_5 | () () () | + jwhois | [] [] [] [] [] | + kbd | [] [] [] [] [] [] | + klavaro | [] [] [] [] [] [] [] | + latrine | [] () [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] [] () [] [] | + libextractor | [] | + libgnutls | [] [] [] [] | + libgphoto2 | [] () [] | + libgphoto2_port | [] () [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] [] [] | + libidn | [] [] [] [] [] | + liferea | [] () [] [] [] [] [] | + lilypond | [] [] [] [] [] [] | + lordsawar | [] [] | + lprng | | + lynx | [] [] [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | [] | + mailutils | [] [] [] [] | + make | [] [] [] [] [] | + man-db | [] [] [] [] | + man-db-manpages | [] [] | + midi-instruments | [] [] [] [] [] [] [] [] [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] [] | + myserver | [] [] [] [] | + nano | [] [] [] [] [] [] [] | + opcodes | [] [] [] [] [] | + parted | [] [] [] | + pies | [] | + popt | [] [] [] [] [] [] | + procps-ng | [] [] | + procps-ng-man | [] [] | + psmisc | [] [] [] [] [] [] [] | + pspp | [] [] [] | + pushover | () [] [] [] | + pwdutils | [] [] [] | + pyspread | [] [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + recutils | [] [] [] [] | + rpm | [] [] [] [] [] | + rush | [] [] [] | + sarg | [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] [] [] | + skribilo | [] [] | + solfege | [] [] [] [] [] [] [] [] | + solfege-manual | [] [] [] [] [] | + spotmachine | [] [] [] [] | + sudo | [] [] [] [] [] [] | + sudoers | [] [] [] [] [] [] | + sysstat | [] [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] [] | + texinfo_document | [] [] [] [] | + tigervnc | [] [] [] [] [] [] | + tin | [] [] [] [] | + tin-man | [] | + tracgoogleappsa... | [] [] [] [] [] | + trader | [] [] [] [] [] [] | + util-linux | [] [] [] [] | + ve | [] [] [] [] [] | + vice | () () () | + vmm | [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | [] () | + wcd | [] [] [] [] | + wcd-man | [] | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] | + wyslij-po | [] [] [] [] | + xboard | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] [] | + +--------------------------------------------------+ + da de el en en_GB en_ZA eo es et eu fa fi fr + 120 130 32 1 6 0 94 95 22 13 4 103 136 + + ga gd gl gu he hi hr hu hy ia id is it ja ka kk + +-------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] [] | + binutils | [] [] [] | + bison | [] | + bison-runtime | [] [] [] [] [] [] [] [] | + buzztrax | | + ccd2cue | [] | + ccide | [] [] | + cflow | [] [] [] | + clisp | | + coreutils | [] [] [] | + cpio | [] [] [] [] [] [] | + cppi | [] [] [] [] [] | + cpplib | [] [] | + cryptsetup | [] | + datamash | | + denemo | [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] | + dink | [] | + direvent | [] | + doodle | [] [] | + dos2unix | [] [] | + dos2unix-man | | + e2fsprogs | [] | + enscript | [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] | + freedink | [] [] [] [] | + fusionforge | | + gas | [] | + gawk | [] () [] | + gcal | | + gcc | | + gdbm | | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] | + gettext-tools | [] [] [] | + gjay | [] | + glunarclock | [] [] [] [] [] [] | + gnubiff | [] [] () | + gnubik | [] [] [] | + gnucash | () () () () () [] | + gnuchess | | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | | + gold | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] [] | + gramadoir | [] [] [] | + grep | [] [] [] [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] | + gst-plugins-base | [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + guix | | + guix-packages | | + gutenprint | [] [] [] | + hello | [] [] [] [] [] | + help2man | [] [] [] | + help2man-texi | | + hylafax | [] | + idutils | [] [] | + iso_15924 | [] [] [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] | + iso_4217 | [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + iso_639_5 | | + jwhois | [] [] [] [] | + kbd | [] [] [] | + klavaro | [] [] [] [] [] | + latrine | [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] () | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | | + libgnutls | [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] [] [] | + libidn | [] [] [] [] | + liferea | [] [] [] [] [] | + lilypond | [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | | + make | [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] [] | + midi-instruments | [] [] [] [] [] [] [] [] [] | + minicom | [] [] [] | + mkisofs | [] [] | + myserver | [] | + nano | [] [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] [] [] | + procps-ng | | + procps-ng-man | | + psmisc | [] [] [] [] | + pspp | [] [] | + pushover | [] | + pwdutils | [] | + pyspread | | + radius | [] | + recode | [] [] [] [] [] [] [] | + recutils | | + rpm | [] | + rush | [] | + sarg | | + sed | [] [] [] [] [] [] [] | + sharutils | | + shishi | | + skribilo | [] | + solfege | [] [] | + solfege-manual | | + spotmachine | | + sudo | [] [] [] [] | + sudoers | [] [] [] | + sysstat | [] [] [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] | + texinfo_document | [] [] | + tigervnc | | + tin | | + tin-man | | + tracgoogleappsa... | [] [] [] [] | + trader | [] [] | + util-linux | [] | + ve | [] | + vice | () () | + vmm | | + vorbis-tools | [] [] | + wastesedge | () | + wcd | | + wcd-man | | + wdiff | [] [] [] | + wget | [] [] [] | + wyslij-po | [] [] [] | + xboard | | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +-------------------------------------------------+ + ga gd gl gu he hi hr hu hy ia id is it ja ka kk + 35 2 47 4 8 2 53 69 2 6 80 11 86 58 0 3 + + kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl +--------------------------------------------------+ - a2ps | [] [] | - aegis | | - ant-phone | | - anubis | | - aspell | [] [] | - bash | | + a2ps | [] [] | + aegis | [] | + anubis | [] [] [] | + aspell | [] [] | + bash | [] [] | bfd | | - bibshelf | [] | binutils | | - bison | | - bison-runtime | [] | - bluez-pin | [] [] | - bombono-dvd | | - buzztard | | - cflow | | - clisp | | - coreutils | [] [] | - cpio | | + bison | [] | + bison-runtime | [] [] [] [] [] [] | + buzztrax | | + ccd2cue | | + ccide | [] [] | + cflow | [] | + clisp | [] | + coreutils | [] [] | + cpio | [] | cppi | | - cpplib | [] | - cryptsetup | | - dfarc | | - dialog | [] [] | + cpplib | [] | + cryptsetup | [] | + datamash | [] [] | + denemo | | + dfarc | [] [] | + dialog | [] [] [] [] [] [] | dico | | - diffutils | [] | - dink | | - doodle | | - e2fsprogs | [] | - enscript | [] | - exif | | - fetchmail | [] | - findutils | [] | - flex | [] | - freedink | | + diffutils | [] [] [] | + dink | [] | + direvent | [] | + doodle | [] | + dos2unix | [] [] | + dos2unix-man | [] | + e2fsprogs | [] | + enscript | [] | + exif | [] [] | + fetchmail | [] | + findutils | [] [] | + flex | [] | + freedink | [] [] | + fusionforge | | gas | | - gawk | [] [] | - gcal | [] | + gawk | [] | + gcal | | gcc | | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] | - gettext-tools | [] [] | - gip | [] | + gdbm | | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] | + gettext-tools | [] | gjay | | - gliv | [] | - glunarclock | [] [] | - gnubiff | | - gnucash | [] | - gnuedu | | - gnulib | | + glunarclock | [] [] | + gnubiff | [] | + gnubik | [] [] | + gnucash | () () () () () () () [] | + gnuchess | [] [] | + 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 | | + gphoto2 | [] | + gprof | [] [] | + gramadoir | [] | + grep | [] [] | + grub | [] [] [] | + gsasl | [] | gss | | - gst-plugins-bad | [] | - gst-plugins-base | [] | - gst-plugins-good | [] | - gst-plugins-ugly | [] | - gstreamer | [] [] [] | - gtick | | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] [] | - gutenprint | | - hello | [] | - help2man | | - 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 | [] | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] [] | + gst-plugins-good | [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | [] [] | + gtick | [] | + gtkam | [] [] | + gtkspell | [] [] [] [] [] [] [] | + guix | | + guix-packages | | + gutenprint | [] | + hello | [] [] [] | + help2man | [] | + help2man-texi | | + hylafax | [] | + idutils | [] | + iso_15924 | () [] [] | + iso_3166 | [] [] [] () [] [] [] [] [] [] | + iso_3166_2 | () [] | + iso_4217 | () [] [] [] | + iso_639 | [] [] () [] [] [] [] | + iso_639_3 | [] () [] | + iso_639_5 | () | + jwhois | [] [] | + kbd | [] | + klavaro | [] [] | latrine | | - ld | [] | - leafpad | [] [] | - libc | [] [] | - libexif | () | - libextractor | | - libgnutls | | - libgpewidget | | - libgpg-error | | - libgphoto2 | | - libgphoto2_port | | - libgsasl | | - libiconv | [] | - libidn | | - lifelines | | - liferea | [] [] | - lilypond | | - linkdr | [] | + ld | | + leafpad | [] [] [] [] [] | + libc | [] [] | + libexif | [] | + libextractor | [] | + libgnutls | [] [] | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | [] [] | + libidn | [] | + liferea | [] [] [] | + lilypond | [] | lordsawar | | lprng | | - lynx | [] | - m4 | | + lynx | [] | + m4 | [] | mailfromd | | mailutils | | - make | | - man-db | | - man-db-manpages | | - minicom | | - mkisofs | | + make | [] [] | + man-db | [] | + man-db-manpages | [] | + midi-instruments | [] [] [] [] [] [] [] | + minicom | [] | + mkisofs | [] | myserver | | - nano | [] [] | - opcodes | | - parted | | + nano | [] [] [] | + opcodes | [] | + parted | [] | pies | | - popt | | - psmisc | | - pspp | [] | - pwdutils | | - radius | [] | - recode | [] [] | - rosegarden | | - rpm | | - rush | | + popt | [] [] [] [] [] | + procps-ng | | + procps-ng-man | | + psmisc | [] | + pspp | [] [] | + pushover | | + pwdutils | [] | + pyspread | | + radius | [] | + recode | [] [] | + recutils | [] | + rpm | [] | + rush | [] | sarg | | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] | - sharutils | [] [] | + sed | [] [] | + sharutils | [] | shishi | | - skencil | | - solfege | | - solfege-manual | | - soundtracker | | - sp | | - sysstat | | - tar | [] | - texinfo | | + skribilo | | + solfege | [] [] | + solfege-manual | [] | + spotmachine | [] | + sudo | [] [] | + sudoers | [] [] | + sysstat | [] [] | + tar | [] [] [] | + texinfo | [] | + texinfo_document | [] | + tigervnc | [] | tin | | - unicode-han-tra... | | - unicode-transla... | | - util-linux-ng | [] | + tin-man | | + tracgoogleappsa... | [] [] [] | + trader | [] | + util-linux | [] | + ve | [] | + vice | [] | + vmm | [] | + vorbis-tools | [] | + wastesedge | [] | + wcd | [] | + wcd-man | [] | + wdiff | [] | + wget | [] [] | + wyslij-po | [] | + xboard | [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +--------------------------------------------------+ + kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl + 5 11 4 6 0 13 22 3 3 3 4 11 2 40 1 124 + + nn or os pa pl ps pt pt_BR ro ru rw sk sl sq sr + +--------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] | + aegis | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] [] [] | + bash | [] [] [] [] [] | + bfd | [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] [] | + buzztrax | | + ccd2cue | [] | + ccide | [] [] [] | + cflow | [] [] | + clisp | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cppi | [] [] [] | + cpplib | [] [] [] | + cryptsetup | [] [] | + datamash | [] [] | + denemo | | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] | + dico | [] | + diffutils | [] [] | + dink | | + direvent | [] [] | + doodle | [] [] | + dos2unix | [] [] [] [] | + dos2unix-man | [] [] | + e2fsprogs | [] | + enscript | [] [] [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] [] [] [] | + fusionforge | | + gas | | + gawk | [] | + gcal | | + gcc | | + gdbm | [] [] [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gjay | [] | + glunarclock | [] [] [] [] [] [] | + gnubiff | [] | + gnubik | [] [] [] [] | + gnucash | () () () () [] | + gnuchess | [] [] | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | | + gold | | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] [] | + gramadoir | [] [] | + grep | [] [] [] [] [] [] | + grub | [] [] [] [] [] | + gsasl | [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] | + guix | | + guix-packages | | + gutenprint | [] [] | + hello | [] [] [] [] [] [] | + help2man | [] [] [] [] | + help2man-texi | [] | + hylafax | | + idutils | [] [] [] | + iso_15924 | [] () [] [] [] [] | + iso_3166 | [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] () [] | + iso_4217 | [] [] () [] [] [] [] [] | + iso_639 | [] [] [] () [] [] [] [] [] [] | + iso_639_3 | [] () | + iso_639_5 | () [] | + jwhois | [] [] [] [] | + kbd | [] [] | + klavaro | [] [] [] [] [] | + latrine | [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] | + libexif | [] () [] | + libextractor | [] | + libgnutls | [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + liferea | [] [] [] [] () [] [] | + lilypond | | + lordsawar | | + lprng | [] | + lynx | [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + midi-instruments | [] [] [] [] [] [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | [] [] | + nano | [] [] [] [] [] [] | + opcodes | | + parted | [] [] [] [] [] [] | + pies | [] | + popt | [] [] [] [] [] [] | + procps-ng | [] | + procps-ng-man | [] | + psmisc | [] [] [] [] | + pspp | [] [] | + pushover | | + pwdutils | [] | + pyspread | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + recutils | [] | + rpm | [] | + rush | [] [] [] | + sarg | [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] | + shishi | [] [] | + skribilo | | + solfege | [] [] [] | + solfege-manual | [] [] | + spotmachine | [] [] | + sudo | [] [] [] [] [] [] | + sudoers | [] [] [] [] | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + texinfo_document | [] [] | + tigervnc | [] | + tin | [] | + tin-man | | + tracgoogleappsa... | [] [] [] [] | + trader | [] | + util-linux | [] [] | + ve | [] [] [] | vice | | vmm | | - vorbis-tools | | + vorbis-tools | [] [] [] | wastesedge | | - wdiff | | - wget | [] [] | - wyslij-po | | - xchat | [] [] [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | + wcd | | + wcd-man | | + wdiff | [] [] [] [] [] | + wget | [] [] [] [] | + wyslij-po | [] [] [] [] | + xboard | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | +--------------------------------------------------+ - af am an ar as ast az be be@latin bg bn_IN bs ca - 6 0 1 2 3 19 1 10 3 28 3 1 38 - - crh cs da de el en en_GB en_ZA eo es et eu fa - +-------------------------------------------------+ - 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 | [] [] [] [] | - gjay | [] | - 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 | [] [] [] [] | - help2man | [] | - 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 | | - myserver | | - nano | [] [] [] | - opcodes | [] [] | - parted | [] [] | - pies | | - popt | [] [] [] [] [] | - psmisc | [] [] [] | - pspp | [] | - pwdutils | [] | - radius | [] | - recode | [] [] [] [] [] [] | - rosegarden | () () () | - rpm | [] [] [] | - rush | | - sarg | | - 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 | [] [] [] [] [] [] | - +-------------------------------------------------+ - crh cs da de el en en_GB en_ZA eo es et eu fa - 5 64 105 117 18 1 8 0 28 89 18 19 0 - - fi 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 | [] [] [] [] [] [] | - gjay | [] | - 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 | [] [] [] | - help2man | [] [] | - 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 | [] [] [] [] | - myserver | | - nano | [] [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] [] | - pies | | - popt | [] [] [] [] [] [] [] [] [] | - psmisc | [] [] [] | - pspp | | - pwdutils | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rosegarden | () () () () () | - rpm | [] [] | - rush | | - sarg | [] | - 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 | [] [] [] [] [] | - +----------------------------------------------------+ - fi fr ga gl gu he hi hr hu hy id is it ja ka kn - 105 121 53 20 4 8 3 5 53 2 120 5 84 67 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 | [] [] | - gjay | | - 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 | [] [] [] | - help2man | | - 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 | | - myserver | | - nano | [] [] | - opcodes | | - parted | | - pies | | - popt | [] [] [] | - psmisc | | - pspp | | - pwdutils | | - radius | | - recode | | - rosegarden | | - rpm | | - rush | | - sarg | | - 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 13 48 4 2 2 4 24 10 20 3 1 + nn or os pa pl ps pt pt_BR ro ru rw sk sl sq sr + 7 3 1 6 114 1 12 83 32 80 3 38 45 7 94 - nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + sv sw ta te tg th tr uk ur vi wa wo zh_CN zh_HK +---------------------------------------------------+ - 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 | [] [] [] [] [] | - gjay | | - gliv | [] [] [] [] [] [] | - glunarclock | [] [] [] [] [] | - gnubiff | [] () | - gnucash | [] () () () | - gnuedu | [] | - gnulib | [] [] [] [] | + a2ps | [] [] [] [] [] | + aegis | [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] | + binutils | [] [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] | + buzztrax | [] [] [] | + ccd2cue | [] [] [] | + ccide | [] [] [] [] | + cflow | [] [] [] [] | + clisp | | + coreutils | [] [] [] [] | + cpio | [] [] [] [] [] | + cppi | [] [] [] [] | + cpplib | [] [] [] [] [] | + cryptsetup | [] [] [] | + datamash | [] [] [] | + denemo | | + dfarc | [] | + dialog | [] [] [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] | + dink | | + direvent | [] [] | + doodle | [] [] | + dos2unix | [] [] [] [] | + dos2unix-man | [] [] [] | + e2fsprogs | [] [] [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + freedink | [] [] | + fusionforge | | + gas | [] | + gawk | [] [] | + gcal | [] [] | + gcc | [] [] | + gdbm | [] [] | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] | + gjay | [] [] | + glunarclock | [] [] [] [] | + gnubiff | [] [] | + gnubik | [] [] [] [] | + gnucash | () () () () [] | + gnuchess | [] [] | + 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 | [] [] [] [] | - help2man | [] [] | - 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 | [] [] [] | + gold | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] [] | + gramadoir | [] [] [] | + grep | [] [] [] [] [] | + grub | [] [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + guix | [] | + guix-packages | | + gutenprint | [] [] [] [] | + hello | [] [] [] [] [] [] | + help2man | [] [] [] | + help2man-texi | [] | + hylafax | [] | + idutils | [] [] [] | + iso_15924 | [] () [] [] () [] | + iso_3166 | [] [] () [] [] () [] [] [] | + iso_3166_2 | () [] [] () [] | + iso_4217 | [] () [] [] () [] [] | + iso_639 | [] [] [] () [] [] () [] [] [] | + iso_639_3 | [] () [] [] () | + iso_639_5 | () [] () | + jwhois | [] [] [] [] | + kbd | [] [] [] | + klavaro | [] [] [] [] [] [] | + latrine | [] [] | + ld | [] [] [] [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] () | + libextractor | [] [] | + libgnutls | [] [] [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | () [] [] [] | + liferea | [] [] [] [] [] | + lilypond | [] | lordsawar | | - lprng | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | [] | - mailutils | [] | - make | [] [] [] [] | - man-db | [] [] [] | - man-db-manpages | [] [] [] | - minicom | [] [] [] [] | - mkisofs | [] [] [] | - myserver | | - nano | [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - pies | [] | - popt | [] [] [] [] | - psmisc | [] [] [] | - pspp | [] [] | - pwdutils | [] | - radius | [] [] [] | - recode | [] [] [] [] [] [] [] [] | - rosegarden | () () | - rpm | [] [] [] | - rush | [] [] | + lprng | [] | + lynx | [] [] [] [] | + m4 | [] [] [] | + mailfromd | [] [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + midi-instruments | [] [] [] [] [] [] | + minicom | [] [] | + mkisofs | [] [] [] | + myserver | [] | + nano | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] [] | + pies | [] [] | + popt | [] [] [] [] [] [] [] | + procps-ng | [] [] | + procps-ng-man | [] | + psmisc | [] [] [] [] | + pspp | [] [] [] | + pushover | [] | + pwdutils | [] [] | + pyspread | [] | + radius | [] [] | + recode | [] [] [] [] | + recutils | [] [] [] | + rpm | [] [] [] [] | + rush | [] [] | sarg | | - 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 | [] [] [] | + sed | [] [] [] [] [] | + sharutils | [] [] [] | + shishi | [] [] | + skribilo | [] | + solfege | [] [] [] | + solfege-manual | [] | + spotmachine | [] [] [] | + sudo | [] [] [] [] | + sudoers | [] [] [] | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + texinfo_document | [] | + tigervnc | [] [] | + tin | [] | + tin-man | | + tracgoogleappsa... | [] [] [] [] [] | + trader | [] | + util-linux | [] [] [] | + ve | [] [] [] [] | + vice | () () | + vmm | | + vorbis-tools | [] [] | + wastesedge | | + wcd | [] [] [] | + wcd-man | [] | + wdiff | [] [] [] [] | + wget | [] [] [] | + wyslij-po | [] [] | + xboard | [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | +---------------------------------------------------+ - nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr - 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 + sv sw ta te tg th tr uk ur vi wa wo zh_CN zh_HK + 91 1 4 3 0 13 50 113 1 126 7 1 95 7 - sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW - +---------------------------------------------------+ - a2ps | [] [] [] [] [] | 27 - aegis | [] | 9 - ant-phone | [] [] [] [] | 9 - anubis | [] [] [] [] | 15 - aspell | [] [] [] | 20 - bash | [] [] [] | 12 - bfd | [] | 6 - bibshelf | [] [] [] | 16 - binutils | [] [] | 8 - bison | [] [] | 12 - bison-runtime | [] [] [] [] [] [] | 29 - bluez-pin | [] [] [] [] [] [] [] [] | 37 - bombono-dvd | [] | 4 - buzztard | [] | 7 - cflow | [] [] [] | 9 - clisp | | 10 - coreutils | [] [] [] [] | 22 - cpio | [] [] [] [] [] [] | 13 - cppi | [] [] | 5 - cpplib | [] [] [] [] [] [] | 14 - 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 | [] [] [] [] [] [] [] | 29 - gettext-tools | [] [] [] [] [] [] | 22 - gip | [] [] [] [] | 22 - gjay | [] | 3 - gliv | [] [] [] | 14 - glunarclock | [] [] [] [] [] | 19 - gnubiff | [] [] | 4 - gnucash | () [] () [] () | 10 - gnuedu | [] [] | 7 - gnulib | [] [] [] [] | 16 - gnunet | [] | 1 - gnunet-gtk | [] [] [] | 5 - gnutls | [] [] [] | 10 - gold | [] | 4 - gpe-aerial | [] [] [] | 18 - gpe-beam | [] [] [] | 19 - gpe-bluetooth | [] [] [] | 13 - 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 | [] [] [] [] [] | 29 - gpe-timesheet | [] [] [] [] [] | 25 - gpe-today | [] [] [] [] [] [] | 30 - gpe-todo | [] [] [] [] | 17 - gphoto2 | [] [] [] [] [] | 24 - gprof | [] [] [] | 15 - gpsdrive | [] [] [] | 11 - gramadoir | [] [] [] | 11 - grep | [] [] [] | 10 - grub | [] [] [] | 14 - gsasl | [] [] [] [] | 14 - gss | [] [] [] | 11 - gst-plugins-bad | [] [] [] [] | 26 - gst-plugins-base | [] [] [] [] [] | 24 - gst-plugins-good | [] [] [] [] | 24 - gst-plugins-ugly | [] [] [] [] [] | 29 - gstreamer | [] [] [] [] | 22 - gtick | [] [] [] | 13 - gtkam | [] [] [] | 20 - gtkorphan | [] [] [] | 14 - gtkspell | [] [] [] [] [] [] [] [] [] | 45 - gutenprint | [] | 10 - hello | [] [] [] [] [] [] | 21 - help2man | [] [] | 7 - hylafax | [] | 5 - idutils | [] [] [] [] | 17 - indent | [] [] [] [] [] [] | 30 - iso_15924 | () [] () [] [] | 16 - iso_3166 | [] [] () [] [] () [] [] [] () | 53 - iso_3166_2 | () [] () [] | 9 - iso_4217 | [] () [] [] () [] [] | 26 - iso_639 | [] [] [] () [] () [] [] [] [] | 38 - iso_639_3 | [] () | 8 - jwhois | [] [] [] [] [] | 16 - kbd | [] [] [] [] [] | 15 - keytouch | [] [] [] | 16 - keytouch-editor | [] [] [] | 14 - keytouch-keyboa... | [] [] [] | 14 - klavaro | [] | 11 - latrine | [] [] [] | 10 - ld | [] [] [] [] | 11 - leafpad | [] [] [] [] [] [] | 33 - libc | [] [] [] [] [] | 21 - libexif | [] () | 7 - libextractor | [] | 1 - libgnutls | [] [] [] | 9 - libgpewidget | [] [] [] | 14 - libgpg-error | [] [] [] | 9 - libgphoto2 | [] [] | 8 - libgphoto2_port | [] [] [] [] | 14 - 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 | [] [] | 9 - myserver | | 0 - nano | [] [] [] [] | 21 - opcodes | [] [] [] | 11 - parted | [] [] [] [] [] | 15 - pies | [] [] | 3 - popt | [] [] [] [] [] [] | 27 - psmisc | [] [] | 11 - pspp | | 4 - pwdutils | [] [] | 6 - radius | [] [] | 9 - recode | [] [] [] [] | 28 - rosegarden | () | 0 - rpm | [] [] [] | 11 - rush | [] [] | 4 - sarg | | 1 - 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 | [] [] [] [] [] | 17 - tin | | 4 - unicode-han-tra... | | 0 - unicode-transla... | | 2 - util-linux-ng | [] [] [] [] | 20 - vice | () () | 1 - vmm | [] | 4 - vorbis-tools | [] | 6 - wastesedge | | 2 - wdiff | [] [] | 7 - wget | [] [] [] [] [] | 26 - wyslij-po | [] [] | 8 - xchat | [] [] [] [] [] [] | 36 - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 - xkeyboard-config | [] [] [] | 22 - +---------------------------------------------------+ - 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW - 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 + zh_TW + +-------+ + a2ps | | 30 + aegis | | 9 + anubis | | 19 + aspell | | 28 + bash | [] | 21 + bfd | | 9 + binutils | | 12 + bison | [] | 18 + bison-runtime | [] | 38 + buzztrax | | 8 + ccd2cue | | 8 + ccide | | 17 + cflow | | 15 + clisp | | 10 + coreutils | | 20 + cpio | | 20 + cppi | | 17 + cpplib | [] | 19 + cryptsetup | | 13 + datamash | | 11 + denemo | | 4 + dfarc | | 16 + dialog | [] | 42 + dico | | 6 + diffutils | | 21 + dink | | 9 + direvent | | 10 + doodle | | 12 + dos2unix | [] | 18 + dos2unix-man | | 9 + e2fsprogs | | 14 + enscript | | 21 + exif | | 26 + fetchmail | | 19 + findutils | | 28 + flex | [] | 19 + freedink | | 23 + fusionforge | | 3 + gas | | 5 + gawk | | 12 + gcal | | 7 + gcc | | 4 + gdbm | | 10 + gettext-examples | [] | 40 + gettext-runtime | [] | 34 + gettext-tools | [] | 24 + gjay | | 8 + glunarclock | [] | 27 + gnubiff | | 9 + gnubik | | 19 + gnucash | () | 7 + gnuchess | | 10 + gnulib | | 23 + gnunet | | 1 + gnunet-gtk | | 1 + gold | | 7 + gphoto2 | [] | 19 + gprof | | 21 + gramadoir | | 14 + grep | [] | 31 + grub | | 21 + gsasl | [] | 19 + gss | | 17 + gst-plugins-bad | | 14 + gst-plugins-base | | 27 + gst-plugins-good | | 32 + gst-plugins-ugly | | 34 + gstreamer | [] | 31 + gtick | | 19 + gtkam | | 24 + gtkspell | [] | 48 + guix | | 3 + guix-packages | | 0 + gutenprint | | 15 + hello | [] | 30 + help2man | | 18 + help2man-texi | | 5 + hylafax | | 5 + idutils | | 14 + iso_15924 | [] | 23 + iso_3166 | [] | 58 + iso_3166_2 | | 9 + iso_4217 | [] | 28 + iso_639 | [] | 46 + iso_639_3 | | 10 + iso_639_5 | | 2 + jwhois | [] | 20 + kbd | | 16 + klavaro | | 30 + latrine | | 7 + ld | [] | 15 + leafpad | [] | 40 + libc | [] | 24 + libexif | | 9 + libextractor | | 5 + libgnutls | | 13 + libgphoto2 | | 9 + libgphoto2_port | [] | 19 + libgsasl | | 18 + libiconv | [] | 29 + libidn | | 17 + liferea | | 29 + lilypond | | 11 + lordsawar | | 3 + lprng | | 3 + lynx | | 19 + m4 | [] | 22 + mailfromd | | 4 + mailutils | | 6 + make | | 19 + man-db | | 14 + man-db-manpages | | 9 + midi-instruments | [] | 43 + minicom | [] | 17 + mkisofs | | 13 + myserver | | 9 + nano | [] | 29 + opcodes | | 12 + parted | [] | 21 + pies | | 4 + popt | [] | 36 + procps-ng | | 5 + procps-ng-man | | 4 + psmisc | [] | 22 + pspp | | 13 + pushover | | 6 + pwdutils | | 8 + pyspread | | 6 + radius | | 9 + recode | | 31 + recutils | | 9 + rpm | [] | 13 + rush | | 10 + sarg | | 4 + sed | [] | 34 + sharutils | | 12 + shishi | | 7 + skribilo | | 4 + solfege | | 19 + solfege-manual | | 9 + spotmachine | | 10 + sudo | | 24 + sudoers | | 20 + sysstat | | 22 + tar | [] | 30 + texinfo | | 17 + texinfo_document | | 11 + tigervnc | | 11 + tin | [] | 7 + tin-man | | 1 + tracgoogleappsa... | [] | 22 + trader | | 11 + util-linux | | 12 + ve | | 14 + vice | | 1 + vmm | | 3 + vorbis-tools | | 13 + wastesedge | | 2 + wcd | | 8 + wcd-man | | 3 + wdiff | [] | 23 + wget | | 19 + wyslij-po | | 14 + xboard | | 9 + xdg-user-dirs | [] | 68 + xkeyboard-config | [] | 27 + +-------+ + 90 teams zh_TW + 166 domains 42 2748 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 @@ -1251,32 +1350,30 @@ 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. +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 June 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'. + If Jun 2014 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.5 Using `gettext' in new packages +1.5 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'. +internationalize it you are welcome to use GNU 'gettext' in your +package. Of course you have to respect the GNU Lesser 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 +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 +'coordinator@translationproject.org' to make the '.pot' files available to the translation teams. - @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + 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, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 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 General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. @@ -1,3 +1,16 @@ +2016-09-22 gettextize <bug-gnu-gettext@gnu.org> + + * m4/gettext.m4: Upgrade to gettext-0.19.7. + * m4/iconv.m4: Upgrade to gettext-0.19.7. + * m4/lib-ld.m4: Upgrade to gettext-0.19.7. + * m4/lib-link.m4: Upgrade to gettext-0.19.7. + * m4/lib-prefix.m4: Upgrade to gettext-0.19.7. + * m4/nls.m4: Upgrade to gettext-0.19.7. + * m4/po.m4: Upgrade to gettext-0.19.7. + * m4/progtest.m4: Upgrade to gettext-0.19.7. + * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in. + (AM_GNU_GETTEXT_VERSION): Bump to 0.19.7. + 2014-10-03 gettextize <bug-gnu-gettext@gnu.org> * m4/po.m4: Upgrade to gettext-0.18.3. @@ -1,11 +1,370 @@ -INSTALLING -Run: -$ ./configure -$ make -# make install +Installation Instructions +************************* +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. -UNINSTALLING -For uninstalling, run: -# make uninstall -from the top folder of this package + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am index c320451..8cf6763 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign SUBDIRS = man doc po src ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index 5f01c8c..6b32158 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in ABOUT-NLS ChangeLog INSTALL compile \ - config.guess config.rpath config.sub depcomp install-sh \ - missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -92,11 +97,13 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(install_sh) -d +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = m4/Makefile CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -155,6 +162,11 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/m4/Makefile.in ABOUT-NLS COPYING ChangeLog \ + INSTALL ar-lib compile config.guess config.rpath config.sub \ + depcomp install-sh ltmain.sh mdate-sh missing mkinstalldirs \ + py-compile texinfo.tex ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -324,6 +336,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -332,7 +345,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign SUBDIRS = man doc po src ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config.rpath m4/Makefile.in src/gettext.h doc/COMPILE \ @@ -360,7 +373,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -394,6 +406,8 @@ $(srcdir)/config.h.in: $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +m4/Makefile: $(top_builddir)/config.status $(top_srcdir)/m4/Makefile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -582,15 +596,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -626,17 +640,17 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -811,6 +825,8 @@ uninstall-am: mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + check-gettext: @if test x$(USE_NLS) != "xyes" ; then \ @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -78,7 +78,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -123,15 +123,14 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,7 +161,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -353,7 +352,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -430,7 +429,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Check for Java compiler. -*- Autoconf -*- # For now we only handle the GNU compiler. -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -448,7 +447,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(GCJ)]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -538,8 +537,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -613,6 +612,9 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -642,7 +644,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -653,7 +655,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -663,7 +665,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -684,7 +686,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -734,7 +736,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -773,7 +775,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -802,7 +804,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -849,7 +851,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -868,7 +870,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -949,7 +951,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1009,7 +1011,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1037,7 +1039,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1056,7 +1058,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Written by Peter Rosin <peda@lysator.liu.se>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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 General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat <<EOF +Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...] + +Members may be specified in a file named with @FILE. +EOF + exit $? + ;; + -v | --v*) + echo "$me, version $scriptversion" + exit $? + ;; +esac + +if test $# -lt 3; then + func_error "you must specify a program, an action and an archive" +fi + +AR=$1 +shift +while : +do + if test $# -lt 2; then + func_error "you must specify a program, an action and an archive" + fi + case $1 in + -lib | -LIB \ + | -ltcg | -LTCG \ + | -machine* | -MACHINE* \ + | -subsystem* | -SUBSYSTEM* \ + | -verbose | -VERBOSE \ + | -wx* | -WX* ) + AR="$AR $1" + shift + ;; + *) + action=$1 + shift + break + ;; + esac +done +orig_archive=$1 +shift +func_file_conv "$orig_archive" +archive=$file + +# strip leading dash in $action +action=${action#-} + +delete= +extract= +list= +quick= +replace= +index= +create= + +while test -n "$action" +do + case $action in + d*) delete=yes ;; + x*) extract=yes ;; + t*) list=yes ;; + q*) quick=yes ;; + r*) replace=yes ;; + s*) index=yes ;; + S*) ;; # the index is always updated implicitly + c*) create=yes ;; + u*) ;; # TODO: don't ignore the update modifier + v*) ;; # TODO: don't ignore the verbose modifier + *) + func_error "unknown action specified" + ;; + esac + action=${action#?} +done + +case $delete$extract$list$quick$replace,$index in + yes,* | ,yes) + ;; + yesyes*) + func_error "more than one action specified" + ;; + *) + func_error "no action specified" + ;; +esac + +if test -n "$delete"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + for member + do + case $1 in + @*) + func_at_file "${1#@}" -REMOVE "$archive" + ;; + *) + func_file_conv "$1" + $AR -NOLOGO -REMOVE:"$file" "$archive" || exit $? + ;; + esac + done + +elif test -n "$extract"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + if test $# -gt 0; then + for member + do + case $1 in + @*) + func_at_file "${1#@}" -EXTRACT "$archive" + ;; + *) + func_file_conv "$1" + $AR -NOLOGO -EXTRACT:"$file" "$archive" || exit $? + ;; + esac + done + else + $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done + fi + +elif test -n "$quick$replace"; then + if test ! -f "$orig_archive"; then + if test -z "$create"; then + echo "$me: creating $orig_archive" + fi + orig_archive= + else + orig_archive=$archive + fi + + for member + do + case $1 in + @*) + func_file_conv "${1#@}" + set x "$@" "@$file" + ;; + *) + func_file_conv "$1" + set x "$@" "$file" + ;; + esac + shift + shift + done + + if test -n "$orig_archive"; then + $AR -NOLOGO -OUT:"$archive" "$orig_archive" "$@" || exit $? + else + $AR -NOLOGO -OUT:"$archive" "$@" || exit $? + fi + +elif test -n "$list"; then + if test ! -f "$orig_archive"; then + func_error "archive not found" + fi + $AR -NOLOGO -LIST "$archive" || exit $? +fi @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff --git a/config.guess b/config.guess index b79252d..2e9ad7f 100644..100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2016-10-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2013-06-10' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -359,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -579,8 +603,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -617,13 +642,13 @@ EOF sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -662,11 +687,11 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -679,12 +704,12 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -789,14 +814,14 @@ EOF echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -826,7 +851,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -878,7 +903,7 @@ EOF exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +926,7 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +957,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +972,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,10 +1000,13 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) + mips64el:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1001,6 +1035,9 @@ EOF ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1020,7 +1057,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1099,7 +1136,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1248,6 +1285,9 @@ EOF SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1260,22 +1300,32 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1306,7 +1356,7 @@ EOF # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1348,7 +1398,7 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1359,171 +1409,25 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; -esac - -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs exit ;; - esac -fi +esac cat >&2 <<EOF $0: unable to guess system type -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from +This script (version $timestamp), has failed to recognize the +operating system you are using. If your script is old, overwrite +config.guess and config.sub with the latest versions from: - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <config-patches@gnu.org> in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff --git a/config.h.in b/config.h.in index 0137e14..9ed146f 100644 --- a/config.h.in +++ b/config.h.in @@ -7,11 +7,11 @@ /* Define to 1 if you have the `atexit' function. */ #undef HAVE_ATEXIT -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE @@ -77,6 +77,13 @@ /* Define to 1 if you have the `mkdir' function. */ #undef HAVE_MKDIR +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the `rmdir' function. */ +#undef HAVE_RMDIR + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT @@ -180,6 +187,9 @@ /* Define to `int' if <sys/types.h> does not define. */ #undef pid_t +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + /* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t diff --git a/config.rpath b/config.rpath index c38b914..a3e25c8 100644..100755 --- a/config.rpath +++ b/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2013 Free Software Foundation, Inc. +# Copyright 1996-2015 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -367,11 +367,7 @@ else dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) + freebsd2.[01]*) hardcode_direct=yes hardcode_minus_L=yes ;; @@ -548,13 +544,11 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; + freebsd[23].*) + library_names_spec='$libname$shrext$versuffix' + ;; freebsd* | dragonfly*) - case "$host_os" in - freebsd[123]*) - library_names_spec='$libname$shrext$versuffix' ;; - *) - library_names_spec='$libname$shrext' ;; - esac + library_names_spec='$libname$shrext' ;; gnu*) library_names_spec='$libname$shrext' diff --git a/config.sub b/config.sub index 9633db7..dd2ca93 100644..100755 --- a/config.sub +++ b/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2016-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ timestamp='2013-08-10' # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to <config-patches@gnu.org>. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ timestamp='2013-08-10' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ timestamp='2013-08-10' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,16 +254,18 @@ case $basic_machine in | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,14 +298,15 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -310,6 +314,7 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -324,7 +329,10 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,18 +377,20 @@ case $basic_machine in | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +410,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,16 +425,19 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -430,6 +445,7 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -506,6 +522,9 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -626,6 +645,14 @@ case $basic_machine in basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -767,6 +794,9 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -822,6 +852,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -998,7 +1032,7 @@ case $basic_machine in ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1008,7 +1042,7 @@ case $basic_machine in ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1354,27 +1388,28 @@ case $os in | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1506,6 +1541,8 @@ case $os in ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1592,9 +1629,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for daisy-player 10.3. +# Generated by GNU Autoconf 2.69 for daisy-player 10.4. # # Report bugs to <jos@jlemmens.nl>. # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='daisy-player' PACKAGE_TARNAME='daisy-player' -PACKAGE_VERSION='10.3' -PACKAGE_STRING='daisy-player 10.3' +PACKAGE_VERSION='10.4' +PACKAGE_STRING='daisy-player 10.4' PACKAGE_BUGREPORT='jos@jlemmens.nl' PACKAGE_URL='www.jlemmens.nl' @@ -751,6 +751,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -837,6 +838,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1089,6 +1091,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1226,7 +1237,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1339,7 +1350,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures daisy-player 10.3 to adapt to many kinds of systems. +\`configure' configures daisy-player 10.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1379,6 +1390,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1409,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of daisy-player 10.3:";; + short | recursive ) echo "Configuration of daisy-player 10.4:";; esac cat <<\_ACEOF @@ -1520,7 +1532,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -daisy-player configure 10.3 +daisy-player configure 10.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2133,7 +2145,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by daisy-player $as_me 10.3, which was +It was created by daisy-player $as_me 10.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2414,6 +2426,7 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} fi gt_needs="$gt_needs " +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2482,7 +2495,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2683,8 +2696,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2703,7 +2716,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2997,7 +3010,7 @@ fi # Define the identity of the package. PACKAGE='daisy-player' - VERSION='10.3' + VERSION='10.4' cat >>confdefs.h <<_ACEOF @@ -3031,8 +3044,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -6500,7 +6513,8 @@ fi done -for ac_header in fcntl.h libintl.h locale.h stdlib.h string.h strings.h sys/ioctl.h unistd.h +for ac_header in fcntl.h libintl.h locale.h stdlib.h string.h strings.h \ + sys/ioctl.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -6677,7 +6691,7 @@ $as_echo "$USE_NLS" >&6; } - GETTEXT_MACRO_VERSION=0.18 + GETTEXT_MACRO_VERSION=0.19 @@ -7999,36 +8013,42 @@ else if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - if test "$cross_compiling" = yes; then : - - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac - + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <iconv.h> #include <string.h> -int main () + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () { - int result = 0; +int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -8041,14 +8061,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -8060,14 +8080,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -8080,14 +8100,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -8107,17 +8127,20 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; + + ; + return 0; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : am_cv_func_iconv_works=yes -else - am_cv_func_iconv_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" fi @@ -9076,6 +9099,73 @@ $as_echo "#define malloc rpl_malloc" >>confdefs.h fi +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 +$as_echo_n "checking for GNU libc compatible realloc... " >&6; } +if ${ac_cv_func_realloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_realloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include <stdlib.h> +#else +char *realloc (); +#endif + +int +main () +{ +return ! realloc (0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_realloc_0_nonnull=yes +else + ac_cv_func_realloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } +if test $ac_cv_func_realloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_REALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" realloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" + ;; +esac + + +$as_echo "#define realloc rpl_realloc" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 $as_echo_n "checking for working strtod... " >&6; } if ${ac_cv_func_strtod+:} false; then : @@ -9212,9 +9302,1106 @@ _ACEOF fi done +for ac_func in rmdir +do : + ac_fn_c_check_func "$LINENO" "rmdir" "ac_cv_func_rmdir" +if test "x$ac_cv_func_rmdir" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_RMDIR 1 +_ACEOF + +fi +done + ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile man/Makefile po/Makefile.in src/Makefile" + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 +$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } +if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFPreferences.h> +int +main () +{ +CFPreferencesCopyAppValue(NULL, NULL) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFPreferencesCopyAppValue=yes +else + gt_cv_func_CFPreferencesCopyAppValue=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 +$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + +$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 +$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } +if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <CoreFoundation/CFLocale.h> +int +main () +{ +CFLocaleCopyCurrent(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_CFLocaleCopyCurrent=yes +else + gt_cv_func_CFLocaleCopyCurrent=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$gt_save_LIBS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 +$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + +$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h + + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + + + + + + + LIBINTL= + LTLIBINTL= + POSUB= + + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 +$as_echo_n "checking for GNU gettext in libc... " >&6; } +if eval \${$gt_func_gnugettext_libc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libc=yes" +else + eval "$gt_func_gnugettext_libc=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then + + + + + + am_save_CPPFLAGS="$CPPFLAGS" + + for element in $INCICONV; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 +$as_echo_n "checking for iconv... " >&6; } +if ${am_cv_func_iconv+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> +#include <iconv.h> + +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <stdlib.h> +#include <iconv.h> + +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_lib_iconv=yes + am_cv_func_iconv=yes +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 +$as_echo "$am_cv_func_iconv" >&6; } + if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <iconv.h> +#include <string.h> + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + +int +main () +{ +int result = 0; + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\263"; + char buf[10]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + ICONV_CONST char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + ICONV_CONST char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + result |= 16; + return result; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + test "$am_cv_func_iconv_works" = no || break + done + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + +$as_echo "#define HAVE_ICONV 1" >>confdefs.h + + fi + if test "$am_cv_lib_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 +$as_echo_n "checking how to link with libiconv... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 +$as_echo "$LIBICONV" >&6; } + else + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + + + + + + + + + + + + use_additional=yes + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + +# Check whether --with-libintl-prefix was given. +if test "${with_libintl_prefix+set}" = set; then : + withval=$with_libintl_prefix; + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi + fi + fi + +fi + + LIBINTL= + LTLIBINTL= + INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi + if test $use_additional = yes; then + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi + fi + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$acl_hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$acl_hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */$acl_libdirstem | */$acl_libdirstem/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then + if test -n "$GCC"; then + case $host_os in + linux* | gnu* | k*bsd*-gnu) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$acl_hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$acl_hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 +$as_echo_n "checking for GNU gettext in libintl... " >&6; } +if eval \${$gt_func_gnugettext_libintl+:} false; then : + $as_echo_n "(cached) " >&6 +else + gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$gt_func_gnugettext_libintl=yes" +else + eval "$gt_func_gnugettext_libintl=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <libintl.h> +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (const char *); + +int +main () +{ + +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +eval ac_res=\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + fi + + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ + && test "$PACKAGE" != gettext-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + + + if test -n "$INTL_MACOSX_LIBS"; then + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" + LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" + fi + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + +$as_echo "#define ENABLE_NLS 1" >>confdefs.h + + else + USE_NLS=no + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 +$as_echo_n "checking whether to use NLS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } + if test "$USE_NLS" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 +$as_echo_n "checking where the gettext function comes from... " >&6; } + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + gt_source="external libintl" + else + gt_source="libc" + fi + else + gt_source="included intl directory" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 +$as_echo "$gt_source" >&6; } + fi + + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 +$as_echo_n "checking how to link with libintl... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 +$as_echo "$LIBINTL" >&6; } + + for element in $INCINTL; do + haveit= + for x in $CPPFLAGS; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + fi + + +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + + +$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h + + fi + + POSUB=po + fi + + + + INTLLIBS="$LIBINTL" + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -9765,7 +10952,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by daisy-player $as_me 10.3, which was +This file was extended by daisy-player $as_me 10.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9832,7 +11019,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -daisy-player config.status 10.3 +daisy-player config.status 10.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ee9d8e4..eaa97cf 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([daisy-player],[10.3],[jos@jlemmens.nl],[],[www.jlemmens.nl]) +AC_INIT([daisy-player], [10.4], [jos@jlemmens.nl], [], [www.jlemmens.nl]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) @@ -40,7 +40,8 @@ AC_CHECK_LIB([sox], [main]) AC_CHECK_LIB([xml2], [main]) # Checks for header files. -AC_CHECK_HEADERS([fcntl.h libintl.h locale.h stdlib.h string.h strings.h sys/ioctl.h unistd.h]) +AC_CHECK_HEADERS([fcntl.h libintl.h locale.h stdlib.h string.h strings.h \ + sys/ioctl.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE @@ -50,12 +51,14 @@ AC_TYPE_SIZE_T # Checks for library functions. AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.3]) +AM_GNU_GETTEXT_VERSION([0.19.7]) AC_FUNC_FORK AC_FUNC_MALLOC +AC_FUNC_REALLOC AC_FUNC_STRTOD AC_CHECK_FUNCS([atexit ftruncate mkdir select setlocale strcasecmp strchr strdup strerror strrchr strstr]) AC_CHECK_FUNCS([isascii]) +AC_CHECK_FUNCS([rmdir]) AC_CONFIG_FILES([Makefile doc/Makefile @@ -63,4 +66,7 @@ AC_CONFIG_FILES([Makefile man/Makefile po/Makefile.in src/Makefile]) +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.18.3]) +AC_PROG_LN_S AC_OUTPUT @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/Changelog b/doc/Changelog index aa7dbc4..813fe02 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -234,5 +234,19 @@ Samuel Thibault <sthibault@debian.org> 10.2.4.1 Little bug in time viewing for Audio CD's solved. 10.3 Daisy-player only worked on a cd with ISO9660 filesystem. - Now it also works on cd's with a Universal Disk Format (UDF) + Now it also works on cd's with a Universal Disk Format (UDF) filesystem. +10.4 html entities are converted correctly again. + daisy-player now uses the htmlParseFile() function of libxml2. + All files will be treated now as UTF-8. + Playback volume can be altered with 'v' and 'V'. + The skip_left() function has been simplified. + New language added: Guatemala. Should also be usefull for + other Central American countries. + Updated the French translation. + Filenames now will be treated case insensitive. + The external executable "find" has been dropped in favour + of an internal function that scans for the "ncc.html", + "*.ncx" and "*.opf" files. + man/Makefile.am changes. + Finnish translation by Jani Kinnunen <janikinnunen340@gmail.com>. diff --git a/doc/Makefile.in b/doc/Makefile.in index c465287..19fc1b3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_html_DATA) ABOUT-NLS COPYING TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -90,7 +98,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +DIST_COMMON = $(srcdir)/Makefile.am $(dist_html_DATA) \ + $(am__DIST_COMMON) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -143,6 +153,8 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(docdir)" DATA = $(dist_html_DATA) $(doc_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + ABOUT-NLS COPYING TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -271,6 +283,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -299,7 +312,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -514,6 +526,8 @@ uninstall-am: uninstall-dist_htmlDATA uninstall-docDATA uninstall uninstall-am uninstall-dist_htmlDATA \ uninstall-docDATA +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. @@ -1,7 +1,8 @@ Daisy-player - A parser to play Daisy CD's with Linux -(C)2003-2015 J. Lemmens +(C)2003-2017 J. Lemmens DESCRIPTION + Daisy-player reads a DAISY-CD and plays its audio-files. Daisy-player also CAN PLAY Audio-cd's and tries to fetch info using cddbget. @@ -18,8 +19,10 @@ Be sure the following extra packages exist on your system: language-pack-af language-pack-de language-pack-es + language-pack-fi language-pack-fr language-pack-hu + language-pack-ml language-pack-nb language-pack-nl language-pack-pl @@ -1,2 +1,2 @@ -- A new effect to set volume with "amixer sset Master playback 80%" -- 'd' command writes the pllaying item to disk, not the item with the cursor. +- time-viewing starts on 00:00 when next page starts in daisy 3 files +- command d - take into account the current level diff --git a/doc/daisy-player.description b/doc/daisy-player.description new file mode 100644 index 0000000..1471e26 --- /dev/null +++ b/doc/daisy-player.description @@ -0,0 +1,45 @@ +Variables: + +Each item of a Daisy-CD is read into the array struct daisy. +Each element of this array has the following variables: + +playorder The playing-order. +x, y The screen-position of the element. +screen The screen-number of the element. +begin The start-time of the element in the audio-file. +duration The duration (in seconds) of this element. +smil_file The name of the smil_file on the cd. +anchor The start-point of the element in the smil_file. +label The label of the element. +level The level of the element. +page_number` The element starts on this page. +daisy_mp The mount-point of the Daisy-CD. +filename A temporary name for an Audio-CD. +first_lsn The start of a track on an Audio-CD. +last_lsn The end of a track on an Audio-CD. + +The struct My_attribute contains the attributes of tags in the smil_files. + +The struct Misc contains global variables. + +Functions: + +First read preferences from $PWD/.daisy-player.xml. read_xml(). +Set current locale. +Read command-line options. +Set two ncurses windows titlewin and screenwin. +The function create_daisy_struct() determines the number of elements +needed in the array daisy. +If argument is an daisy-file or there is a Daisy-CD, read information +into the struct daisy. +If it is Daisy 2.02 read data with function fill_daisy_struct_2(). +If it is Daisy 3 read data with function read_daisy_3(). +If it is an Audio-CD handle it with the function get_number_of_tracks(). + +The function browse() will handle keyh-board commands. +ENTER starts playing. Each element of the array daisy contains the name of +the smil_file and the anchor which points to the start of this +item in the audio-file. The audio-file is played with the sox library. +The sox library is too slow for finding the startpoint in the audio-file. So +the utilityh madplay is used for cutting out the clip and it is written +to a temporary WAV-file. Playing itself is done by sox. diff --git a/doc/daisy-player.html b/doc/daisy-player.html index 9d234be..df53929 100644 --- a/doc/daisy-player.html +++ b/doc/daisy-player.html @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Man page of daisy-player</TITLE> </HEAD><BODY> <H1>daisy-player</H1> -Section: Linux Reference Manual (1)<BR>Updated: 30 mei 2015<BR><A HREF="#index">Index</A> +Section: Linux Reference Manual (1)<BR>Updated: 26 June 2017<BR><A HREF="#index">Index</A> <A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR> <A NAME="lbAB"> </A> @@ -108,7 +108,7 @@ view previous screen <DT><B>enter</B> <DD> -Start playing +Start playing <DT><B>space,0</B> <DD> @@ -189,6 +189,14 @@ stop playing <DD> increase playing speed +<DT><B>V,7</B> + +<DD> +increase playback volume (beware of Clipping) +<DT><B>v,1</B> + +<DD> +decrease playback volume </DL> <A NAME="lbAH"> </A> <H2>NOTES</H2> @@ -233,7 +241,7 @@ Jos Lemmens <<A HREF="mailto:jos@jlemmens.nl">jos@jlemmens.nl</A>> <A NAME="lbAM"> </A> <H2>COPYRIGHT</H2> -Copyright (C)2003-2015 Jos Lemmens <<A HREF="mailto:jos@jlemmens.nl">jos@jlemmens.nl</A>> +Copyright (C)2003-2017 Jos Lemmens <<A HREF="mailto:jos@jlemmens.nl">jos@jlemmens.nl</A>> <P> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, 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 General Public License along with this program (see the file COPYING); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA @@ -259,6 +267,6 @@ This program is free software; you can redistribute it and/or modify it under th This document was created by <A HREF="/cgi-bin/man/man2html">man2html</A>, using the manual pages.<BR> -Time: 14:30:13 GMT, May 30, 2015 +Time: 20:23:46 GMT, June 26, 2017 </BODY> </HTML> diff --git a/doc/daisy-player.txt b/doc/daisy-player.txt index b223593..bb211b9 100644 --- a/doc/daisy-player.txt +++ b/doc/daisy-player.txt @@ -38,7 +38,7 @@ cursor right,6 skip to next phrase cursor left,4 skip to previous phrase page-down,3 view next screen page-up,9 view previous screen -enter Start playing +enter Start playing space,0 pause/resume playing home,* play on normal speed / search for a label @@ -59,6 +59,8 @@ p place a bookmark q quit daisy-player. The playing-point will be saved as bookmark. s stop playing U,+ increase playing speed +V,7 increase playback volume (beware of Clipping) +v,1 decrease playback volume NOTES Daisy-player uses the sox-library and the ALSA sound-driver for audio-output. On some systems daisy-player quits with the message that the soundcard cannot be used. I don't know how to solve this problem yet, sorry. @@ -79,6 +81,6 @@ cddbget(1), unar(1), eject(1), udisksctl(1) AUTHOR Jos Lemmens <jos@jlemmens.nl> COPYRIGHT -Copyright (C)2003-2015 Jos Lemmens <jos@jlemmens.nl> +Copyright (C)2003-2017 Jos Lemmens <jos@jlemmens.nl> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, 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 General Public License along with this program (see the file COPYING); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA diff --git a/install-sh b/install-sh index 377bb86..59990a1 100644..100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/m4/Makefile.in b/m4/Makefile.in index bb4c7bf..5270f60 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -88,7 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -112,6 +122,8 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -240,6 +252,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -263,7 +276,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign m4/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -431,6 +443,8 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 8d1f066..da31efe 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,16 +1,16 @@ -# gettext.m4 serial 66 (gettext-0.18.2) -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. +# gettext.m4 serial 67 (gettext-0.19.6) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: @@ -399,3 +399,7 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED], dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) + + +dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) diff --git a/m4/iconv.m4 b/m4/iconv.m4 index a503646..4e37363 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 18 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. +# iconv.m4 serial 19 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -72,27 +72,33 @@ AC_DEFUN([AM_ICONV_LINK], if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - AC_RUN_IFELSE( - [AC_LANG_SOURCE([[ + am_cv_func_iconv_works=no + for ac_iconv_const in '' 'const'; do + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[ #include <iconv.h> #include <string.h> -int main () -{ - int result = 0; + +#ifndef ICONV_CONST +# define ICONV_CONST $ac_iconv_const +#endif + ]], + [[int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); if (cd_utf8_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\342\202\254"; /* EURO SIGN */ + static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */ char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 1; @@ -105,14 +111,14 @@ int main () iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); if (cd_ascii_to_88591 != (iconv_t)(-1)) { - static const char input[] = "\263"; + static ICONV_CONST char input[] = "\263"; char buf[10]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_ascii_to_88591, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) result |= 2; @@ -124,14 +130,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304"; + static ICONV_CONST char input[] = "\304"; static char buf[2] = { (char)0xDE, (char)0xAD }; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = 1; char *outptr = buf; size_t outbytesleft = 1; size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) result |= 4; @@ -144,14 +150,14 @@ int main () iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); if (cd_88591_to_utf8 != (iconv_t)(-1)) { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; char buf[50]; - const char *inptr = input; + ICONV_CONST char *inptr = input; size_t inbytesleft = strlen (input); char *outptr = buf; size_t outbytesleft = sizeof (buf); size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, + &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) result |= 8; @@ -171,17 +177,14 @@ int main () && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) result |= 16; return result; -}]])], - [am_cv_func_iconv_works=yes], - [am_cv_func_iconv_works=no], - [ -changequote(,)dnl - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac -changequote([,])dnl - ]) +]])], + [am_cv_func_iconv_works=yes], , + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + test "$am_cv_func_iconv_works" = no || break + done LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index dd91025..ab97d39 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 3 (gettext-0.18) -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,35 +13,40 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. -dnl Checks for special options needed on MacOS X. +dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. AC_DEFUN([gt_INTL_MACOSX], [ - dnl Check for API introduced in MacOS X 10.2. + dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], - [CFPreferencesCopyAppValue(NULL, NULL)], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <CoreFoundation/CFPreferences.h>]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi - dnl Check for API introduced in MacOS X 10.3. + dnl Check for API introduced in Mac OS X 10.3. AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <CoreFoundation/CFLocale.h>]], + [[CFLocaleCopyCurrent();]])], [gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index c145e47..91ca911 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ # lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 073f040..d8d5d1f 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ # lib-link.m4 serial 26 (gettext-0.18.2) -dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 60908e8..0465f47 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -1,17 +1,17 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: @@ -1,16 +1,16 @@ -# po.m4 serial 21 (gettext-0.18.3) -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. +# po.m4 serial 24 (gettext-0.19) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: @@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS], dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 7b39123..0921e1e 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,16 +1,16 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: diff --git a/man/Makefile.am b/man/Makefile.am index ceeed39..3899cdd 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -3,8 +3,18 @@ man_MANS = daisy-player.1 all: daisy-player daisy-player: - @which txt2man > /dev/null && txt2man -p ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1 +# @which txt2man > /dev/null && txt2man -p ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1 +# @file ${srcdir}/$@.1 && \ +# man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html + +#Date: Sun, 13 Nov 2016 16:22:29 +0000 +#From: Daniel Shahaf <danielsh@apache.org> +#Subject: Bug#844232: daisy-player: man page title is wrong if build directory +# isn't named ${package}-${version} +#To: Debian Bug Tracking System <submit@bugs.debian.org> + + @which txt2man > /dev/null && txt2man -t $@ -s 1 -v "Linux Reference Manual" -r $(VERSION) ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1 @file ${srcdir}/$@.1 && \ - man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html + man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html daisy-player.1: diff --git a/man/Makefile.in b/man/Makefile.in index aa4611c..a9bf24b 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = man -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -88,7 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -143,6 +153,7 @@ am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -271,6 +282,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -295,7 +307,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign man/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -512,13 +523,25 @@ uninstall-man: uninstall-man1 pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 +.PRECIOUS: Makefile + all: daisy-player daisy-player: - @which txt2man > /dev/null && txt2man -p ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1 +# @which txt2man > /dev/null && txt2man -p ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1 +# @file ${srcdir}/$@.1 && \ +# man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html + +#Date: Sun, 13 Nov 2016 16:22:29 +0000 +#From: Daniel Shahaf <danielsh@apache.org> +#Subject: Bug#844232: daisy-player: man page title is wrong if build directory +# isn't named ${package}-${version} +#To: Debian Bug Tracking System <submit@bugs.debian.org> + + @which txt2man > /dev/null && txt2man -t $@ -s 1 -v "Linux Reference Manual" -r $(VERSION) ${srcdir}/../doc/$@.txt > ${srcdir}/$@.1 @file ${srcdir}/$@.1 && \ - man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html + man2html ${srcdir}/$@.1 | tail -n +3 > ${srcdir}/../doc/$@.html daisy-player.1: diff --git a/man/daisy-player.1 b/man/daisy-player.1 index 73e910e..bab33d4 100644 --- a/man/daisy-player.1 +++ b/man/daisy-player.1 @@ -1,5 +1,5 @@ -.\"Text automatically generated by txt2man -.TH daisy-player 1 "30 mei 2015" "daisy-player-10.3" "Linux Reference Manual" +.\" Text automatically generated by txt2man +.TH daisy-player 1 "26 June 2017" "10.4" "Linux Reference Manual" .SH NAME \fBdaisy-player \fP- player for DAISY Digital Talking Books or Audio-CD's \fB @@ -85,7 +85,7 @@ view previous screen .TP .B enter -Start playing +Start playing .TP .B space,0 @@ -166,6 +166,14 @@ stop playing .B U,+ increase playing speed +.TP +.B +V,7 +increase playback volume (beware of Clipping) +.TP +.B +v,1 +decrease playback volume .SH NOTES Daisy-player uses the sox-library and the ALSA sound-driver for audio-output. On some systems \fBdaisy-player\fP quits with the message that the soundcard cannot be used. I don't know how to solve this problem yet, sorry. .PP @@ -191,6 +199,6 @@ This file, in XML-format, contains the name of the desired audio device and the .SH AUTHOR Jos Lemmens <jos@jlemmens.nl> .SH COPYRIGHT -Copyright (C)2003-2015 Jos Lemmens <jos@jlemmens.nl> +Copyright (C)2003-2017 Jos Lemmens <jos@jlemmens.nl> .PP This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, 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 General Public License along with this program (see the file COPYING); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA diff --git a/mdate-sh b/mdate-sh new file mode 100755 index 0000000..9e2c0c9 --- /dev/null +++ b/mdate-sh @@ -0,0 +1,228 @@ +#!/bin/sh +# Get modification time of a file or directory and pretty-print it. + +scriptversion=2015-04-09.19; # UTC + +# Copyright (C) 1995-2014 Free Software Foundation, Inc. +# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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 General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +fi + +case $1 in + '') + echo "$0: No file. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: mdate-sh [--help] [--version] FILE + +Pretty-print the modification day of FILE, in the format: +1 January 1970 + +Report bugs to <bug-automake@gnu.org>. +EOF + exit $? + ;; + -v | --v*) + echo "mdate-sh $scriptversion" + exit $? + ;; +esac + +error () +{ + echo "$0: $1" >&2 + exit 1 +} + + +# Prevent date giving response in another language. +LANG=C +export LANG +LC_ALL=C +export LC_ALL +LC_TIME=C +export LC_TIME + +# Use UTC to get reproducible result +TZ=UTC +export TZ + +# GNU ls changes its time format in response to the TIME_STYLE +# variable. Since we cannot assume 'unset' works, revert this +# variable to its documented default. +if test "${TIME_STYLE+set}" = set; then + TIME_STYLE=posix-long-iso + export TIME_STYLE +fi + +save_arg1=$1 + +# Find out how to get the extended ls output of a file or directory. +if ls -L /dev/null 1>/dev/null 2>&1; then + ls_command='ls -L -l -d' +else + ls_command='ls -l -d' +fi +# Avoid user/group names that might have spaces, when possible. +if ls -n /dev/null 1>/dev/null 2>&1; then + ls_command="$ls_command -n" +fi + +# A 'ls -l' line looks as follows on OS/2. +# drwxrwx--- 0 Aug 11 2001 foo +# This differs from Unix, which adds ownership information. +# drwxrwx--- 2 root root 4096 Aug 11 2001 foo +# +# To find the date, we split the line on spaces and iterate on words +# until we find a month. This cannot work with files whose owner is a +# user named "Jan", or "Feb", etc. However, it's unlikely that '/' +# will be owned by a user whose name is a month. So we first look at +# the extended ls output of the root directory to decide how many +# words should be skipped to get the date. + +# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. +set x`$ls_command /` + +# Find which argument is the month. +month= +command= +until test $month +do + test $# -gt 0 || error "failed parsing '$ls_command /' output" + shift + # Add another shift to the command. + command="$command shift;" + case $1 in + Jan) month=January; nummonth=1;; + Feb) month=February; nummonth=2;; + Mar) month=March; nummonth=3;; + Apr) month=April; nummonth=4;; + May) month=May; nummonth=5;; + Jun) month=June; nummonth=6;; + Jul) month=July; nummonth=7;; + Aug) month=August; nummonth=8;; + Sep) month=September; nummonth=9;; + Oct) month=October; nummonth=10;; + Nov) month=November; nummonth=11;; + Dec) month=December; nummonth=12;; + esac +done + +test -n "$month" || error "failed parsing '$ls_command /' output" + +# Get the extended ls output of the file or directory. +set dummy x`eval "$ls_command \"\\\$save_arg1\""` + +# Remove all preceding arguments +eval $command + +# Because of the dummy argument above, month is in $2. +# +# On a POSIX system, we should have +# +# $# = 5 +# $1 = file size +# $2 = month +# $3 = day +# $4 = year or time +# $5 = filename +# +# On Darwin 7.7.0 and 7.6.0, we have +# +# $# = 4 +# $1 = day +# $2 = month +# $3 = year or time +# $4 = filename + +# Get the month. +case $2 in + Jan) month=January; nummonth=1;; + Feb) month=February; nummonth=2;; + Mar) month=March; nummonth=3;; + Apr) month=April; nummonth=4;; + May) month=May; nummonth=5;; + Jun) month=June; nummonth=6;; + Jul) month=July; nummonth=7;; + Aug) month=August; nummonth=8;; + Sep) month=September; nummonth=9;; + Oct) month=October; nummonth=10;; + Nov) month=November; nummonth=11;; + Dec) month=December; nummonth=12;; +esac + +case $3 in + ???*) day=$1;; + *) day=$3; shift;; +esac + +# Here we have to deal with the problem that the ls output gives either +# the time of day or the year. +case $3 in + *:*) set `date`; eval year=\$$# + case $2 in + Jan) nummonthtod=1;; + Feb) nummonthtod=2;; + Mar) nummonthtod=3;; + Apr) nummonthtod=4;; + May) nummonthtod=5;; + Jun) nummonthtod=6;; + Jul) nummonthtod=7;; + Aug) nummonthtod=8;; + Sep) nummonthtod=9;; + Oct) nummonthtod=10;; + Nov) nummonthtod=11;; + Dec) nummonthtod=12;; + esac + # For the first six month of the year the time notation can also + # be used for files modified in the last year. + if (expr $nummonth \> $nummonthtod) > /dev/null; + then + year=`expr $year - 1` + fi;; + *) year=$3;; +esac + +# The result. +echo $day $month $year + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff --git a/mkinstalldirs b/mkinstalldirs new file mode 100755 index 0000000..55d537f --- /dev/null +++ b/mkinstalldirs @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2009-04-28.21; # UTC + +# Original author: Noah Friedman <friedman@prep.ai.mit.edu> +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +nl=' +' +IFS=" "" $nl" +errstatus=0 +dirmode= + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to <bug-automake@gnu.org>." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the 'mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because '.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +for file +do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp=$pathcomp/ + done +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/po/ChangeLog b/po/ChangeLog index 04a1c7f..1c3d7f9 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2016-09-22 gettextize <bug-gnu-gettext@gnu.org> + + * Makefile.in.in: New file, from gettext-0.19.7. + * Rules-quot: Upgrade to gettext-0.19.7. + 2014-10-03 gettextize <bug-gnu-gettext@gnu.org> * Makefile.in.in: Upgrade to gettext-0.18.3. @@ -1,2 +1,2 @@ #Set of available languages -af de en@quot en@boldquot es fr hu nb nl pl pt sl sv +af de en@quot en@boldquot es_ES.utf8 es_GT.utf8 fi fr hu ml nb nl pl pt sl sv diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 32753a0..8f34f00 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,20 +1,19 @@ # Makefile for PO directory in any package using GNU gettext. # Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License but which still want to provide support for the GNU gettext -# functionality. -# Please note that the actual code of GNU gettext is covered by the GNU -# General Public License and is *not* in the public domain. +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. # -# Origin: gettext-0.18 -GETTEXT_MACRO_VERSION = 0.18 +# Origin: gettext-0.19.7 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -32,21 +31,23 @@ gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -# Define $(MKDIR_P). +# We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, # @install_sh@ does not start with $(SHELL), so we add it. # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -# Gnulib provides a backport of autoconf 2.60's AC_PROG_MKDIR_P, -# with a fix from autoconf 2.62 for interoperability with automake 1.9.6, -# so use $(MKDIR_P) in the rest of this makefile. mkinstalldirs = $(SHELL) @install_sh@ -d install_sh = $(SHELL) @install_sh@ MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ +# When building gettext-tools, we prefer to use the built programs +# rather than installed programs. However, we can't do that when we +# are cross compiling. +CROSS_COMPILING = @CROSS_COMPILING@ + GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ GMSGFMT_yes = @GMSGFMT_015@ @@ -79,6 +80,16 @@ POTFILES = \ CATALOGS = @CATALOGS@ +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) + +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) + # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: @@ -141,11 +152,29 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ - package_gnu='GNU '; \ + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ else \ - package_gnu=''; \ + package_prefix=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -165,12 +194,17 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_gnu}@PACKAGE@" \ + --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ esac test ! -f $(DOMAIN).po || { \ + if test -f $(srcdir)/$(DOMAIN).pot-header; then \ + sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \ + cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \ + rm -f $(DOMAIN).1po; \ + fi; \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ @@ -193,13 +227,14 @@ $(srcdir)/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot +$(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ - && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ *) \ @@ -215,7 +250,7 @@ install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ for file in $(DISTFILES.common) Makevars.template; do \ $(INSTALL_DATA) $(srcdir)/$$file \ $(DESTDIR)$(gettextsrcdir)/$$file; \ @@ -233,7 +268,7 @@ install-data-yes: all cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(MKDIR_P) $(DESTDIR)$$dir; \ + $(mkdir_p) $(DESTDIR)$$dir; \ if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ @@ -269,12 +304,11 @@ install-data-yes: all install-strip: install -install-dvi install-html install-info install-pdf install-ps: installdirs: installdirs-exec installdirs-data installdirs-exec: installdirs-data: installdirs-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext-tools"; then \ - $(MKDIR_P) $(DESTDIR)$(gettextsrcdir); \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi @@ -285,7 +319,7 @@ installdirs-data-yes: cat=`basename $$cat`; \ lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(MKDIR_P) $(DESTDIR)$$dir; \ + $(mkdir_p) $(DESTDIR)$$dir; \ for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ if test -n "$$lc"; then \ if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ @@ -357,7 +391,7 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) @@ -401,7 +435,7 @@ update-po: Makefile .nop.po-update: @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ + if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 455bf84..163a3c2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,8 @@ # List of source files which contain translatable strings. src/audiocd.c -src/daisy-player.c +src/common.c +src/daisy2.02.c src/daisy3.c +src/daisy-player.c src/paranoia.c diff --git a/po/Rules-quot b/po/Rules-quot index 5931e53..baf6528 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,3 +1,4 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot @@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) $(MSGINIT_OPTIONS) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ Binary files differ@@ -17,299 +17,335 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Willem van der Walt <wvdwalt@csir.co.za> +# some lines are translated with "trans -b en:af" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-01-29 15:06+0200\n" "Last-Translator: Willem van der Walt <wvdwalt@csir.co.za>>\n" "Language-Team: Willem van der Walt <wvdwalt@csir.co.za>\n" "Language: af\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker kan nie hierdie lêer hanteer nie." + # 33 -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Kan nie %s lees nie" +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Probeer asseblief hierdie boek met daisy-player te speel" + +# 33 +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Kan nie type %d lees nie" + +# 15 +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Gaan na bladsynommer:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Wag asseblief..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Kies die volgende klankkaart" + +# 34 +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Kan nie /proc/asound/cards lees nie" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Hierdie boek het geen klank. Speel hierdie boek met eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Geen items gevind nie. Probeer opsie \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Geen items gevind nie. Probeer opsie \"-O\"." + # 5 -#: src/daisy-player.c:434 +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' vir hulp -" # 1 -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d bladsye " +msgid "%d pages" +msgstr "%d bladsye" # 3 -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " vlak: %d van %d " +msgid "level: %d of %d" +msgstr "vlak: %d van %d" # 4 -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " totale lengte: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "totale lengte: %02d:%02d:%02d" # 38 -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Hierdie bevele is beskikbaar in hierdie weergawe:" # 41 -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "Af peiltjie,2 - skuif die loper na die volgende item" # 44 -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "op peiltjie,8 - skuif die loper na die vorige item" # 43 -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "regs peiltjie,6 - spring na die volgende frase toe" # 42 -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "links peiltjie,4 - spring na die vorige frase toe" # 57 -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - wys die volgende bladsy" # 58 -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - wys die vorige bladsy" # 46 -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - begin speel" # 62 -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "spasie,0 - stop tydelik/hervat terugspeel" # 50 -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - speel teen normale spoed" # 23 -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Druk enige sleutel vir die volgende bladsy..." # 32 -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" -msgstr "/ - soek vir 'n ettiket" +msgstr "/ - soek vir 'n ettiket" # 45 -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" -msgstr "d - stoor huidige item op skyf" +msgstr "d - stoor huidige item op skyf" # 11 -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" -msgstr "D,- - verlaag terugspeelspoed" +msgstr "D,- - verlaag terugspeelspoed" # 59 -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" -msgstr "" +msgstr "e,. - ophou daisy-player, plaas 'n boekmerk en verwyder" # 47 -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" -"f - Kry die item wat nou speel en skuif die loper daarheen" +"f - Kry die item wat nou speel en skuif die loper daarheen" # 48 -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" -msgstr "g - gaan na tyd" +msgstr "g - gaan na tyd" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" -msgstr "g - gaan na tyd" +msgstr "g - gaan na tyd" # 48 -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" -msgstr "G - gaan na bladsynommer" +msgstr "G - gaan na bladsynommer" # 49 -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" -msgstr "h,? - wys hierdie help-bladsy" +msgstr "h,? - wys hierdie help-bladsy" # 51 -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" -msgstr "j,5 - speel net die huidige item" +msgstr "j,5 - speel net die huidige item" # 52 -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" -msgstr "l - verander na die volgende vlak" +msgstr "l - verander na die volgende vlak" # 16 -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" -msgstr "L - verander na die vorige vlak" +msgstr "L - verander na die vorige vlak" # 53 -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" -msgstr "n - soek vorentoe" +msgstr "n - soek vorentoe" # 18 -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" -msgstr "N - soek agteruit" +msgstr "N - soek agteruit" # 55 -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" -msgstr "o - kies die volgende klankkaart" +msgstr "o - kies die volgende klankkaart" # 56 -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" -msgstr "p - maak 'n boekmerk" +msgstr "p - maak 'n boekmerk" # 59 -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" -msgstr "q - stop daisy-player en maak 'n boekmerk" +msgstr "q - stop daisy-player en maak 'n boekmerk" # 60 -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" -msgstr "s - hou op speel" +msgstr "s - hou op speel" # 29 -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" -msgstr "U,+ - verhoog terugspeelspoed" +msgstr "U,+ - verhoog terugspeelspoed" + +# 11 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - afspeel volume te verminder" + +# 29 +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - verhoog afspeel volume (pasop vir afsny)" # 37 -#: src/daisy-player.c:833 +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Druk enige sleutel om die help-skerm te verlaat..." # 20 -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Wag asseblief... -----------------------" # 30 -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Wat soek u? " +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Wat soek u?" -# 15 -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Gaan na bladsynommer: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Gaan na tyd: (mm:ss): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Kies die volgende klankkaart" - -# 34 -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Kan nie /proc/asound/cards lees nie" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Gaan na tyd: (mm:ss):" # 13 -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - weergawe %s %s" # 39 -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sGebruiksaanwysings: %s [directory met 'n Daisy-struktuur] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "" +"Gebruiksaanwysings: %s [directory met 'n Daisy-struktuur] | " +"[Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_toestel] [-d ALSA_klank_toestel]" # 34 -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Kan nie /proc/mounts lees nie." # 13 # 13 # 6 -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "'n program om Daisy CD's in Linux te speel" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Besig om vir 'n DAISY CD te soek..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Geen DAISY CD of audio CD is gekry nie" # 36 -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Daar is nie 'n daisy-cd in die CD speler nie." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Audio CD gekry. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Audio CD gekry." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Besig om tietels vanaf freedb.freedb.org te kry..." # 13 -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - weergawe %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - weergawe %s - (C)2017 J. Lemmens" # 22 -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Druk 'h' vir hulp " - -# 33 -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Kan nie type %d lees nie" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Druk 'h' vir hulp" diff --git a/po/daisy-player.pot b/po/daisy-player.pot index 0f8d3ab..54dd88a 100644 --- a/po/daisy-player.pot +++ b/po/daisy-player.pot @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Jos Lemmens <jos@jlemmens.nl> -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the daisy-player package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: daisy-player 10.3\n" +"Project-Id-Version: daisy-player 10.4\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,236 +17,267 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "" + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "" + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "" + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "" + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " +msgid "%d pages" msgstr "" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " +msgid "level: %d of %d" msgstr "" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" msgstr "" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "" -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "" -#: src/daisy-player.c:833 -msgid "Press any key to leave help..." +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" msgstr "" -#: src/daisy-player.c:1065 -msgid "Please wait... -------------------------" +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" msgstr "" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "" - -#: src/daisy-player.c:1256 -msgid "Go to page number: " +#: src/daisy-player.c:670 +msgid "Press any key to leave help..." msgstr "" -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " +#: src/daisy-player.c:817 +msgid "Please wait... -------------------------" msgstr "" -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" +#: src/daisy-player.c:924 +msgid "What do you search?" msgstr "" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" msgstr "" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" msgstr "" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "" -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "" -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "" -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." msgstr "" -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "" -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" msgstr "" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "" - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" msgstr "" Binary files differ@@ -17,11 +17,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Klaus Knopper <knopper@knopper.net> +# some lines are translated with "trans -b en:de" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-01-29 15:06+0200\n" "Last-Translator: Klaus Knopper <knopper@knopper.net>\n" "Language-Team: Klaus Knopper <knopper@knopper.net>\n" @@ -30,116 +31,162 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker kann diese Datei nicht verarbeiten." + # 33 -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Kann %s nicht lesen" +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Bitte versuchen Sie, dieses Buch mit daisy-player zu spielen" + +# 33 +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Kann type: %d nicht lesen" + +# 15 +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Gehe zur Seitenzahl:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Warten Sie mal..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Wählen Sie eine Soundkarte aus:" + +# 34 +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Kann /proc/mounts nicht lesen" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Dieses Buch hat kein Audio. Spiel dieses Buch mit eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Keine Elemente gefunden. Versuchen Sie die Option \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Keine Elemente gefunden. Versuchen Sie die Option \"-O\"." + # 5 -#: src/daisy-player.c:434 +#: src/daisy-player.c:306 msgid "'h' for help -" -msgstr "'h' hilfe ---" +msgstr "'h' hilfe ----" # 1 -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d Seiten " +msgid "%d pages" +msgstr "%d Seiten" # 3 -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " Level: %d von %d " +msgid "level: %d of %d" +msgstr "Level: %d von %d" # 4 -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " Gesamtlänge: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "Gesamtlänge: %02d:%02d:%02d" # 38 -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Folgende Befehle sind in dieser Version vorhanden:" # 41 -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "Pfeil runter,2 - verschiebt den Cursor auf das nächste Element" # 44 -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "Pfeil hoch,8 - verschiebt den Cursor auf das vorhergehende Element" # 43 -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "Pfeil rechts,6 - springe zur nächsten Phrase" # 42 -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "Pfeil links,4 - springe zur vorhergehenden Phrase" # 57 -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "Seite runter,3 - zur nächsten Seite" # 58 -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "Seite hoch,9 - zur vorigen Seite" # 46 -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "Eingabetaste - abspielen" # 62 -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "Leertaste,0 - Pause-/Weiter" # 50 -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - spiele mit normaler Geschwindigkeit" # 23 -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Taste drücken für nächste Seite..." # 32 -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - suche nach einem Begriff" # 45 -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - Aktuelles Element speichern" # 11 -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - verringere Abspielgeschwindigkeit" # 59 -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "" +"e,. - Beenden Sie Daisy-Player, legen Sie ein Lesezeichen und " +"Auswerfen" # 47 -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" @@ -147,169 +194,160 @@ msgstr "" "platzieren" # 48 -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" -msgstr "G - zur Seitenzahl gehen (falls vorhanden)" +msgstr "g - geh zur Zeit in diesem Lied (MM:SS)" # 48 -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" -msgstr "G - zur Seitenzahl gehen (falls vorhanden)" +msgstr "g - geh zur Zeit in diesem Artikel (MM:SS)" # 48 -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - zur Seitenzahl gehen (falls vorhanden)" # 49 -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - diese Hilfe anzeigen" # 51 -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - nur das aktuelle Element abspielen" # 52 -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - zum nächsten Level wechseln" # 16 -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - zum vorigen Level wechseln" # 53 -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - Suche vorwärts" # 18 -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - Suche rückwärts" # 55 -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - nächstes sound device für Ausgabe wählen" # 56 -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - Lesezeichen setzen" # 59 -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - Daisy-Player verlassen und Lesezeichen setzen" # 60 -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - Abspielen stoppen" # 29 -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - erhöhe Abspielgeschwindigkeit" +# 11 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - verringern Sie die Wiedergabelautstärke" + +# 29 +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "" +"V,7 - erhöhe die Wiedergabe-Lautstärke (Vorsicht beim Clipping)" + # 37 -#: src/daisy-player.c:833 +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Taste drücken, um die Hilfe zu verlassen..." # 20 -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Bitte warten... ------------------------" # 30 -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Suchen nach...? " +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Suchen nach...?" -# 15 -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Gehe zur Seitenzahl: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "" - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "" - -# 34 -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Kann /proc/mounts nicht lesen" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Gehe zur Zeit (MM:SS):" # 13 -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Version %s %s" # 39 -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sAufruf: %s [Verzeichnis mit einer Daisy-Struktur] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "" +"Aufruf: %s [Verzeichnis mit einer Daisy-Struktur] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_device] [-d ALSA Soundkarte]" # 34 -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Kann /proc/mounts nicht lesen." # 6 -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Ein Programm, um Daisy CDs unter Linux abzuspielen" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Scannen für eine Daisy-CD" -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Kein DAISY-CD oder Audio-CD gefunden" # 36 -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Keine Daisy-CD im Laufwerk." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Eine Audio-CD gefunden. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Eine Audio-CD gefunden." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Holen Titel von freedb.freedb.org..." # 13 -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Version %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Version %s - (C)2017 J. Lemmens" # 22 -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" msgstr "'h' für Hilfe drücken" - -# 33 -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Kann type: %d nicht lesen" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo Binary files differindex 6853356..ae0b14e 100644 --- a/po/en@boldquot.gmo +++ b/po/en@boldquot.gmo diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 6f46858..9f8aca6 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,7 +1,7 @@ # English translations for daisy-player package. -# Copyright (C) 2014 Jos Lemmens <jos@jlemmens.nl> +# Copyright (C) 2017 Jos Lemmens <jos@jlemmens.nl> # This file is distributed under the same license as the daisy-player package. -# Automatically generated, 2014. +# Automatically generated, 2017. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: daisy-player 9.2.1\n" +"Project-Id-Version: daisy-player 10.4\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" -"PO-Revision-Date: 2014-12-04 16:41+0100\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" +"PO-Revision-Date: 2017-06-28 10:28+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@boldquot\n" @@ -42,237 +42,268 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker cannot handle this file." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Cannot read %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Please try to play this book with daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Cannot read type: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Go to page number:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Please wait..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Select a soundcard:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Cannot read /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "This book has no audio. Play this book with eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "No items found. Try option “[1m-N[0m”." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "No items found. Try option “[1m-O[0m”." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "‘[1mh[0m’ for help -" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d pages " +msgid "%d pages" +msgstr "%d pages" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " level: %d of %d " +msgid "level: %d of %d" +msgstr "level: %d of %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " total length: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "total length: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "These commands are available in this version:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "cursor down,2 - move cursor to the next item" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "cursor up,8 - move cursor to the previous item" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "cursor right,6 - skip to next phrase" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "cursor left,4 - skip to previous phrase" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - view next page" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - view previous page" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - start playing" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "space,0 - pause/resume playing" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - play on normal speed" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Press any key for next page..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - search for a label" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - store current item to disk" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - decrease playing speed" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "e,. - quit daisy-player, place a bookmark and eject" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" "f - find the currently playing item and place the cursor there" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - go to time in this song (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - go to time in this item (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - go to page number" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - give this help" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - just play current item" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - switch to next level" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - switch to previous level" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - search forwards" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - search backwards" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - select next output sound device" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - place a bookmark" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - quit daisy-player and place a bookmark" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - stop playing" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - increase playing speed" -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - decrease playback volume" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - increase playback volume (beware of Clipping)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Press any key to leave help..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Please wait... -------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "What do you search? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Go to page number: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Go to time (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Select a soundcard:" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "What do you search?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Cannot read /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Go to time (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Version %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUsage: %s [directory_with_a_Daisy-structure] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_device] [-d ALSA_sound_device]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Cannot read /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "A parser to play Daisy CD's with Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Scanning for a Daisy CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "No DAISY-CD or Audio-cd found" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "No Daisy CD in drive." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Found an Audio-CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Found an Audio-CD." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Get titles from freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Version %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Version %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Press ‘[1mh[0m’ for help " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Cannot read type: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Press ‘[1mh[0m’ for help" diff --git a/po/en@quot.gmo b/po/en@quot.gmo Binary files differindex 39e20ec..e18d4f9 100644 --- a/po/en@quot.gmo +++ b/po/en@quot.gmo diff --git a/po/en@quot.po b/po/en@quot.po index 0056ffe..62c9051 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for daisy-player package. -# Copyright (C) 2014 Jos Lemmens <jos@jlemmens.nl> +# Copyright (C) 2017 Jos Lemmens <jos@jlemmens.nl> # This file is distributed under the same license as the daisy-player package. -# Automatically generated, 2014. +# Automatically generated, 2017. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: daisy-player 9.2.1\n" +"Project-Id-Version: daisy-player 10.4\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" -"PO-Revision-Date: 2014-12-04 16:41+0100\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" +"PO-Revision-Date: 2017-06-28 10:28+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@quot\n" @@ -39,237 +39,268 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker cannot handle this file." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Cannot read %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Please try to play this book with daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Cannot read type: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Go to page number:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Please wait..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Select a soundcard:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Cannot read /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "This book has no audio. Play this book with eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "No items found. Try option “-N”." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "No items found. Try option “-O”." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "‘h’ for help -" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d pages " +msgid "%d pages" +msgstr "%d pages" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " level: %d of %d " +msgid "level: %d of %d" +msgstr "level: %d of %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " total length: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "total length: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "These commands are available in this version:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "cursor down,2 - move cursor to the next item" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "cursor up,8 - move cursor to the previous item" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "cursor right,6 - skip to next phrase" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "cursor left,4 - skip to previous phrase" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - view next page" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - view previous page" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - start playing" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "space,0 - pause/resume playing" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - play on normal speed" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Press any key for next page..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - search for a label" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - store current item to disk" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - decrease playing speed" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "e,. - quit daisy-player, place a bookmark and eject" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" "f - find the currently playing item and place the cursor there" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - go to time in this song (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - go to time in this item (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - go to page number" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - give this help" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - just play current item" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - switch to next level" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - switch to previous level" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - search forwards" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - search backwards" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - select next output sound device" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - place a bookmark" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - quit daisy-player and place a bookmark" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - stop playing" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - increase playing speed" -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - decrease playback volume" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - increase playback volume (beware of Clipping)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Press any key to leave help..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Please wait... -------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "What do you search? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Go to page number: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Go to time (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Select a soundcard:" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "What do you search?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Cannot read /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Go to time (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Version %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUsage: %s [directory_with_a_Daisy-structure] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_device] [-d ALSA_sound_device]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Cannot read /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "A parser to play Daisy CD's with Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Scanning for a Daisy CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "No DAISY-CD or Audio-cd found" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "No Daisy CD in drive." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Found an Audio-CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Found an Audio-CD." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Get titles from freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Version %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Version %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Press ‘h’ for help " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Cannot read type: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Press ‘h’ for help" diff --git a/po/es.gmo b/po/es.gmo Binary files differdeleted file mode 100644 index 05c7ae6..0000000 --- a/po/es.gmo +++ /dev/null diff --git a/po/es_ES.utf8.gmo b/po/es_ES.utf8.gmo Binary files differnew file mode 100644 index 0000000..6f11c54 --- /dev/null +++ b/po/es_ES.utf8.gmo diff --git a/po/es.po b/po/es_ES.utf8.po index 14006fa..846358e 100644 --- a/po/es.po +++ b/po/es_ES.utf8.po @@ -1,6 +1,6 @@ # message catalog file for daisy-player - Spanish version # -# Copyright (C) 2003-2015 J. Lemmens +# Copyright (C) 2003-2017 J. Lemmens # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -17,249 +17,282 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Hanna Tulleken <hannatulleken@gmail.com> +# some lines are translated with "trans -b en:es" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-01-29 15:06+0200\n" "Last-Translator: Hanna Tulleken <hannatulleken@gmail.com>\n" "Language-Team: Hanna Tulleken <hannatulleken@gmail.com>\n" -"Language: es\n" +"Language: es_ES.utf8\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker ei pysty käsittelemään tätä tiedostoa." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "No poder leer %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Por favor, intenta reproducir este libro con daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "No poder leer: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Ir a página número:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Por favor espera..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "seleccionar una ficha sonora:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "No poder leer /proc/sólido/fichas" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Este libro no tiene audio. Escuchar este libro con eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "No se encontraron artículos. Pruebe la opción \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "No se encontraron artículos. Pruebe la opción \"-O\"." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' para ayudar-" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d páginas " +msgid "%d pages" +msgstr "%d páginas" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " nivel: %d o %d " +msgid "level: %d of %d" +msgstr "nivel: %d o %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " total longitud: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "total longitud: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Estas orden estan disponibles en esta versión:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "cursor abajo,2 - desplazar el cursor hasta el tema próximo" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "cursor arriba,8 - desplazar el cursor para el tema anterior" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "cursor derecho,6 - saltar para la frase próxima" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "cursor izquierdo,4 - saltar para la frase anterior" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" -msgstr "página,3 - abaja - ver página proxima" +msgstr "página-abaja,3 - ver página proxima" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "página-ariba,9 - ver página anterior" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "entrar - empezar escuchar" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "espacio,0 - pausa/reanudar escuchar" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "inicio,* - escuchar a velocidad normal" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Hacer clic cada tecla por la página proxima..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - buscar por una etiqueta" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - almacenar el tema actual en disk" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - disminuir velocidad de escuchar" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "e,. - dejar daisy-player, poner una marcapágina y echar" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "f - encontrar el item escuchando y poner el cursor allí" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" -msgstr "g - ir para tiempo en este canción (MM:SS)" +msgstr "g - ir a tiempo en este canción (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" -msgstr "g - ir para tiempo en este tema (MM:SS)" +msgstr "g - ir a tiempo en este tema (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" -msgstr "G - ir para página número (cuando hay)" +msgstr "G - ir a página número (cuando hay)" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - dar esta ayuda" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - solo escuchar el tema actual" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - gambiar al nivél proxima" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - gambiar al nivél antes" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - buscar adelante" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - buscar atrás" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - seleccionar la proxima salida de dispositivo sonido" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - poner una marcapágina" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - dejar daisy-player y poner una marcapágina" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - parar escuchar" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - acelerar velocidad de escuchar" -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - disminuir play-back volumen" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "" +"V,7 - acelerar play-back volumen ( cuidar de Clipping )" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Hacer click alguna tecla para salir ayudar..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Por favor esperar... -------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " +#: src/daisy-player.c:924 +msgid "What do you search?" msgstr "¿Qué buscas?" -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Ir a página número: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Ir para tiempo (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "seleccionar una ficha sonora: " +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Ir a tiempo (MM:SS):" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "No poder leer /proc/sólido/fichas" - -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Versión %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUso: %s [manual_con_una_Daisy-estructura] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Uso: %s [manual_con_una_Daisy-estructura] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_dispositivo] [-d ALSA_sonido_dispositivo]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "No poder leer /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Un analizador para escuchar Daisy CD con Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." -msgstr "Explorar para un Daisy CD..." +msgstr "Explorar un Daisy CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "No encontrada DAISY-CD o Audio-cd" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "No hay Daisy-CD en el unidad." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Encontrada un Audio-CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Encontrada un Audio-CD." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Coger títulos de freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Versión %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Versión %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Hacer clic 'h' para ayudar " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "No poder leer %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "'h' para ayudar" diff --git a/po/es_GT.utf8.gmo b/po/es_GT.utf8.gmo Binary files differnew file mode 100644 index 0000000..09c3849 --- /dev/null +++ b/po/es_GT.utf8.gmo diff --git a/po/es_GT.utf8.po b/po/es_GT.utf8.po new file mode 100644 index 0000000..70ff249 --- /dev/null +++ b/po/es_GT.utf8.po @@ -0,0 +1,301 @@ +# message catalog file for daisy-player - Central American Spanish version +# +# Copyright (C) 2003-2017 J. Lemmens +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by 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 General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# translated by Oscar Gonzalez Gallegos +# some lines are translated with "trans -b en:es" +msgid "" +msgstr "" +"Project-Id-Version: gettext 0.11.2\n" +"Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" +"PO-Revision-Date: 2013-01-29 15:06+0200\n" +"Last-Translator: Oscar Gonzalez Gallegos <ventas@prediomix.com>\n" +"Language-Team: Oscar Gonzalez Gallegos <ventas@prediomix.com>\n" +"Language: es_GT.utf8\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker no puede manejar este archivo." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 +#, c-format +msgid "Cannot read %s" +msgstr "No se puede leer %s" + +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Por favor, intenta reproducir este libro con daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "No poder leer: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Ir a página número:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Por favor espera..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "seleccionar una tarjeta de sonido:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "No se puede leer /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Este libro no contiene audio." + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "No se encontraron artículos. Pruebe la opción \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "No se encontraron artículos. Pruebe la opción \"-O\"." + +#: src/daisy-player.c:306 +msgid "'h' for help -" +msgstr "'h' para ayuda -" + +#: src/daisy-player.c:310 +#, c-format +msgid "%d pages" +msgstr "%d páginas" + +#: src/daisy-player.c:315 +#, c-format +msgid "level: %d of %d" +msgstr "nivel: %d de %d" + +#: src/daisy-player.c:323 +#, c-format +msgid "total length: %02d:%02d:%02d" +msgstr "longitud total: %02d:%02d:%02d" + +#: src/daisy-player.c:597 +msgid "These commands are available in this version:" +msgstr "Estas órdenes o comandos estan disponibles en esta versión:" + +#: src/daisy-player.c:601 +msgid "cursor down,2 - move cursor to the next item" +msgstr "cursor abajo,2 - desplazar el cursor hasta el tema próximo" + +#: src/daisy-player.c:603 +msgid "cursor up,8 - move cursor to the previous item" +msgstr "cursor arriba,8 - desplazar el cursor al tema anterior" + +#: src/daisy-player.c:605 +msgid "cursor right,6 - skip to next phrase" +msgstr "cursor derecho,6 - saltar a la frase próxima" + +#: src/daisy-player.c:607 +msgid "cursor left,4 - skip to previous phrase" +msgstr "cursor izquierdo,4 - saltar a la frase anterior" + +#: src/daisy-player.c:609 +msgid "page-down,3 - view next page" +msgstr "página-abajo,3 - ver página próxima" + +#: src/daisy-player.c:611 +msgid "page-up,9 - view previous page" +msgstr "página-ariba,9 - ver página anterior" + +#: src/daisy-player.c:613 +msgid "enter - start playing" +msgstr "intro - empezar la lectura" + +#: src/daisy-player.c:615 +msgid "space,0 - pause/resume playing" +msgstr "espacio,0 - pausa/reanudar la lectura" + +#: src/daisy-player.c:617 +msgid "home,* - play on normal speed" +msgstr "inicio,* - escuchar a velocidad normal" + +#: src/daisy-player.c:619 +msgid "Press any key for next page..." +msgstr "Presione cualquier tecla para ir a la proxima página ..." + +#: src/daisy-player.c:625 +msgid "/ - search for a label" +msgstr "/ - buscar por una etiqueta" + +#: src/daisy-player.c:627 +msgid "d - store current item to disk" +msgstr "d - almacenar el tema actual en el disco" + +#: src/daisy-player.c:629 +msgid "D,- - decrease playing speed" +msgstr "D,- - disminuir velocidad de lectura" + +#: src/daisy-player.c:631 +msgid "e,. - quit daisy-player, place a bookmark and eject" +msgstr "e,. - cerrar daisy-player, poner un marcapágina y salir" + +#: src/daisy-player.c:633 +msgid "" +"f - find the currently playing item and place the cursor there" +msgstr "" +"f - encontrar el item que está siendo escuchado y poner el " +"cursor allí" + +#: src/daisy-player.c:636 +msgid "g - go to time in this song (MM:SS)" +msgstr "g - ir a tiempo específico en esta canción (MM:SS)" + +#: src/daisy-player.c:639 +msgid "g - go to time in this item (MM:SS)" +msgstr "g - ir para tiempo específico en este tema (MM:SS)" + +#: src/daisy-player.c:642 +msgid "G - go to page number" +msgstr "G - ir para página número (cuando hay)" + +#: src/daisy-player.c:644 +msgid "h,? - give this help" +msgstr "h,? - dar esta ayuda" + +#: src/daisy-player.c:646 +msgid "j,5 - just play current item" +msgstr "j,5 - solo escuchar el tema actual" + +#: src/daisy-player.c:648 +msgid "l - switch to next level" +msgstr "l - cambiar al nivel proximo" + +#: src/daisy-player.c:650 +msgid "L - switch to previous level" +msgstr "L - cambiar al nivel anterior" + +#: src/daisy-player.c:652 +msgid "n - search forwards" +msgstr "n - buscar hacia adelante" + +#: src/daisy-player.c:654 +msgid "N - search backwards" +msgstr "N - buscar hacia atrás" + +#: src/daisy-player.c:656 +msgid "o - select next output sound device" +msgstr "" +"o - seleccionar la proxima salida de dispositivo de sonido" + +#: src/daisy-player.c:658 +msgid "p - place a bookmark" +msgstr "p - poner un marcapágina" + +#: src/daisy-player.c:660 +msgid "q - quit daisy-player and place a bookmark" +msgstr "q - cerrar daisy-player y poner una marcapágina" + +#: src/daisy-player.c:662 +msgid "s - stop playing" +msgstr "s - parar la lectura" + +#: src/daisy-player.c:664 +msgid "U,+ - increase playing speed" +msgstr "U,+ - acelerar velocidad de lectura" + +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 -reducir velocidad de lectura" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "" +"V,7 -aumentar volumen de lectura (puede haber distorsión )" + +#: src/daisy-player.c:670 +msgid "Press any key to leave help..." +msgstr "Presione cualquier tecla para salir de la ayuda..." + +#: src/daisy-player.c:817 +msgid "Please wait... -------------------------" +msgstr "Por favor esperar... -------------------------" + +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "¿Qué busca?" + +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Ir a tiempo específico (MM:SS):" + +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 +#, c-format +msgid "Daisy-player - Version %s %s" +msgstr "Daisy-player - Versión %s %s" + +#: src/daisy-player.c:1584 +#, c-format +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Uso: %s [manual_con_una_Daisy-estructura] | [Daisy_book_archive]" + +#: src/daisy-player.c:1586 +msgid "[-c cdrom_device] [-d ALSA_sound_device]" +msgstr "[-c cdrom_dispositivo] [-d ALSA_sonido_dispositivo]" + +#: src/daisy-player.c:1599 +msgid "Cannot read /proc/mounts." +msgstr "No se puede leer /proc/mounts." + +#: src/daisy-player.c:1793 +msgid "A parser to play Daisy CD's with Linux" +msgstr "Un analizador para escuchar Daisy CD con Linux" + +#: src/daisy-player.c:1795 +msgid "Scanning for a Daisy CD..." +msgstr "Explorando por un Daisy CD..." + +#: src/daisy-player.c:1896 src/daisy-player.c:1999 +msgid "No DAISY-CD or Audio-cd found" +msgstr "No se encontró DAISY CD o Audio-cd" + +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 +msgid "No Daisy CD in drive." +msgstr "No hay Daisy CD en el unidad." + +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Se ha encontrado un CD de audio." + +#: src/daisy-player.c:1984 +msgid "Get titles from freedb.freedb.org..." +msgstr "Coger títulos de freedb.freedb.org..." + +#: src/daisy-player.c:2113 +#, c-format +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Versión %s - (C)2017 J. Lemmens" + +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "'h' para ayuda" diff --git a/po/fi.gmo b/po/fi.gmo Binary files differnew file mode 100644 index 0000000..3d378d3 --- /dev/null +++ b/po/fi.gmo diff --git a/po/fi.po b/po/fi.po new file mode 100644 index 0000000..25d3ab7 --- /dev/null +++ b/po/fi.po @@ -0,0 +1,300 @@ +# message catalog file for daisy-player - Finnish version +# +# Copyright (C) 2003-2017 J. Lemmens +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by 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 General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# translated by Jani Kinnunen <janikinnunen340@gmail.com> +# some lines are translated with "trans -b en:fi" +msgid "" +msgstr "" +"Project-Id-Version: gettext 0.11.2\n" +"Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" +"PO-Revision-Date: 2017-06-19 17:45+0200\n" +"Last-Translator: Jani Kinnunen <janikinnunen340@gmail.com>\n" +"Language-Team: Jani Kinnunen <janikinnunen340@gmail.com>\n" +"Language: fi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker ei pysty käsittelemään tätä tiedostoa." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 +#, c-format +msgid "Cannot read %s" +msgstr "Ei voi lukea %s" + +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Yritä pelata tätä kirjaa daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Ei voida lukea tyyppiä: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Siirry sivunumeroon:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Odota..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Valitse äänikortti:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Ei voi lukea /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Tässä kirjassa ei ole ääntä. Käytä toistamiseen eBook-speakeria" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Kohteita ei löytynyt. Kokeile valitsinta \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Kohteita ei löytynyt. Kokeile valitsinta \"-O\"." + +#: src/daisy-player.c:306 +msgid "'h' for help -" +msgstr "Saat ohjeita painamalla 'h' -" + +#: src/daisy-player.c:310 +#, c-format +msgid "%d pages" +msgstr "%d sivua" + +#: src/daisy-player.c:315 +#, c-format +msgid "level: %d of %d" +msgstr "taso: %d / %d" + +#: src/daisy-player.c:323 +#, c-format +msgid "total length: %02d:%02d:%02d" +msgstr "kokonaiskesto: %02d:%02d:%02d" + +#: src/daisy-player.c:597 +msgid "These commands are available in this version:" +msgstr "Seuraavat komennot ovat käytettävissä tässä versiossa:" + +#: src/daisy-player.c:601 +msgid "cursor down,2 - move cursor to the next item" +msgstr "nuoli alas,2 - siirrä kohdistin seuraavaan kohteeseen" + +#: src/daisy-player.c:603 +msgid "cursor up,8 - move cursor to the previous item" +msgstr "nuoli ylös,8 - siirrä kohdistin edelliseen kohteeseen" + +#: src/daisy-player.c:605 +msgid "cursor right,6 - skip to next phrase" +msgstr "nuoli oikealle,6 - siirry seuraavaan virkkeeseen" + +#: src/daisy-player.c:607 +msgid "cursor left,4 - skip to previous phrase" +msgstr "nuoli vasemmalle,4 - siirry edelliseen virkkeeseen" + +#: src/daisy-player.c:609 +msgid "page-down,3 - view next page" +msgstr "page down,3 - näytä seuraava sivu" + +#: src/daisy-player.c:611 +msgid "page-up,9 - view previous page" +msgstr "page up,9 - näytä edellinen sivu" + +#: src/daisy-player.c:613 +msgid "enter - start playing" +msgstr "enter - aloita toisto" + +#: src/daisy-player.c:615 +msgid "space,0 - pause/resume playing" +msgstr "välilyönti,0 - pysäytä/jatka toistoa" + +#: src/daisy-player.c:617 +msgid "home,* - play on normal speed" +msgstr "home,* - toista normaalilla nopeudella" + +#: src/daisy-player.c:619 +msgid "Press any key for next page..." +msgstr "Siirry seuraavalle sivulle painamalla jotain näppäintä..." + +#: src/daisy-player.c:625 +msgid "/ - search for a label" +msgstr "/ - etsi nimekettä" + +#: src/daisy-player.c:627 +msgid "d - store current item to disk" +msgstr "d - tallenna nykyinen kohde levylle" + +#: src/daisy-player.c:629 +msgid "D,- - decrease playing speed" +msgstr "D,- - vähennä toistonopeutta" + +#: src/daisy-player.c:631 +msgid "e,. - quit daisy-player, place a bookmark and eject" +msgstr "" +"e,. - poistu daisy-playerista, lisää kirjanmerkki ja poista levy asemasta" + +#: src/daisy-player.c:633 +msgid "" +"f - find the currently playing item and place the cursor there" +msgstr "" +"f - etsi tällä hetkellä toistettava kohde ja siirrä kohdistin sen " +"kohdalle" + +#: src/daisy-player.c:636 +msgid "g - go to time in this song (MM:SS)" +msgstr "g - siirry määrättyyn aikaan tässä kappaleessa (MM:SS)" + +#: src/daisy-player.c:639 +msgid "g - go to time in this item (MM:SS)" +msgstr "g - siirry määrättyyn aikaan tässä kohteessa (MM:SS)" + +#: src/daisy-player.c:642 +msgid "G - go to page number" +msgstr "G - siirry sivulle" + +#: src/daisy-player.c:644 +msgid "h,? - give this help" +msgstr "h,? - näytä tämä ohje" + +#: src/daisy-player.c:646 +msgid "j,5 - just play current item" +msgstr "j,5 - toista vain nykyinen kohde" + +#: src/daisy-player.c:648 +msgid "l - switch to next level" +msgstr "l - vaihda seuraavalle tasolle" + +#: src/daisy-player.c:650 +msgid "L - switch to previous level" +msgstr "L - vaihda edelliselle tasolle" + +#: src/daisy-player.c:652 +msgid "n - search forwards" +msgstr "n - etsi eteenpäin" + +#: src/daisy-player.c:654 +msgid "N - search backwards" +msgstr "N - etsi taaksepäin" + +#: src/daisy-player.c:656 +msgid "o - select next output sound device" +msgstr "o - valitse seuraava äänilaite kappaleen toistamiseen" + +#: src/daisy-player.c:658 +msgid "p - place a bookmark" +msgstr "p - lisää kirjanmerkki" + +#: src/daisy-player.c:660 +msgid "q - quit daisy-player and place a bookmark" +msgstr "q - poistu daisy-playerista ja lisää kirjanmerkki" + +#: src/daisy-player.c:662 +msgid "s - stop playing" +msgstr "s - keskeytä toisto" + +#: src/daisy-player.c:664 +msgid "U,+ - increase playing speed" +msgstr "U,+ - lisää toistonopeutta" + +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - vähennä toiston äänenvoimakkuutta" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - lisää toiston äänenvoimakkuutta (varo leikkautumista)" + +#: src/daisy-player.c:670 +msgid "Press any key to leave help..." +msgstr "Poistu ohjeesta painamalla jotain näppäintä..." + +#: src/daisy-player.c:817 +msgid "Please wait... -------------------------" +msgstr "Odota... -------------------------" + +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Mitä haluat etsiä?" + +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Siirry aikaan (MM:SS):" + +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 +#, c-format +msgid "Daisy-player - Version %s %s" +msgstr "Daisy-player - versio %s %s" + +#: src/daisy-player.c:1584 +#, c-format +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Käyttö: %s [Daisy-kirjan_hakemisto] | [Daisy-kirjojen_arkisto]" + +#: src/daisy-player.c:1586 +msgid "[-c cdrom_device] [-d ALSA_sound_device]" +msgstr "[-c cdrom-laite] [-d ALSA-äänilaite]" + +#: src/daisy-player.c:1599 +msgid "Cannot read /proc/mounts." +msgstr "Liitoskohtaa /proc/mounts ei voi lukea." + +#: src/daisy-player.c:1793 +msgid "A parser to play Daisy CD's with Linux" +msgstr "Jäsennin Daisy-CD-levyjen toistamiseen Linuxissa" + +#: src/daisy-player.c:1795 +msgid "Scanning for a Daisy CD..." +msgstr "Etsitään Daisy-CD:tä..." + +#: src/daisy-player.c:1896 src/daisy-player.c:1999 +msgid "No DAISY-CD or Audio-cd found" +msgstr "DAISY- tai ääni-CD:tä ei löytynyt" + +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 +msgid "No Daisy CD in drive." +msgstr "Asemassa ei ole Daisy-CD:tä." + +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Löytyi ääni-CD." + +#: src/daisy-player.c:1984 +msgid "Get titles from freedb.freedb.org..." +msgstr "Hae kappaleiden nimet freedb.freedb.org:ista..." + +#: src/daisy-player.c:2113 +#, c-format +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - versio %s - (C)2017 J. Lemmens" + +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Saat ohjeita painamalla 'h'" Binary files differ@@ -1,6 +1,6 @@ # message catalog file for daisy-player - French version # -# Copyright (C) 2003-2015 J. Lemmens +# Copyright (C) 2003-2017 J. Lemmens # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -16,252 +16,286 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# translated by Osvaldo La Rosa <aldo.nospam@scarlet.be> +# translated by Osvaldo La Rosa <yellowpenguin@telenet.be> +# some lines are translated with "trans -b en:fr" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" -"PO-Revision-Date: 2013-01-29 15:06+0200\n" -"Last-Translator: Osvaldo La Rosa <aldo.nospam@scarlet.be>\n" -"Language-Team: Osvaldo La Rosa <aldo.nospam@scarlet.be>\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" +"PO-Revision-Date: 2017-07-21 15:06+0200\n" +"Last-Translator: Osvaldo La Rosa <yellowpenguin@telenet.be>\n" +"Language-Team: Osvaldo La Rosa <yellowpenguin@telenet.be>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "L'eBook-Speaker ne peut pas gérer ce fichier." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" -msgstr "Ne sait pas lire %s" +msgstr "Je ne sais pas lire ceci %s" + +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Veuillez essayer de lire ce livre avec daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Je ne sais pas lire le type: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Aller à la page numéro:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "S'il vous plaît, attendez..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Sélectionnez une carte son:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Je ne sais pas lire /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Ce livre ne contient pas de piste audio. Lire avec eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Aucun élément trouvé. Essayez l'option \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Aucun élément trouvé. Essayez l'option \"-O\"." -#: src/daisy-player.c:434 +#: src/daisy-player.c:306 msgid "'h' for help -" -msgstr "'h' pour obtenir de l'aide" +msgstr "'h' pour l'aide" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d pages " +msgid "%d pages" +msgstr "%d pages" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " niveau: %d de %d " +msgid "level: %d of %d" +msgstr "niveau: %d de %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " dure totale: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "durée totale: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" -msgstr "Les commandes suivantes sont disponibles dans cette version:" +msgstr "Ces commandes sont disponibles dans cette version:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" -msgstr "curseur bas,2 - dplacer le curseur vers l'lment suivant" +msgstr "curseur bas,2 - déplacer le curseur vers l'élément suivant" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" -msgstr "curseur haut,8 - dplacer le curseur vers l'lment prcdent" +msgstr "curseur haut,8 - déplacer le curseur vers l'élément précédent" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" -msgstr "curseur droit,6 - aller la phrase suivante" +msgstr "curseur droit,6 - aller à la phrase suivante" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" -msgstr "curseur gauche,4 - revenir la phrase prcdente" +msgstr "curseur gauche,4 - revenir à la phrase précédente" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page bas,3 - afficher la page suivante" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" -msgstr "page haut,9 - afficher la page prcdente" +msgstr "page haut,9 - afficher la page précédente" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" -msgstr "enter - dmarrer l'coute" +msgstr "enter - lancer l'écoute" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" -msgstr "espace,0 - pause/poursuivre l'coute" +msgstr "espace,0 - pause/poursuivre l'écoute" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" -msgstr "home,* - couter la vitesse normale" +msgstr "home,* - écouter à la vitesse normale" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." -msgstr "Appuyez sur une touche pour aller la page suivante..." +msgstr "Appuyez sur une touche pour aller à la page suivante..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" -msgstr "/ - chercher un label" +msgstr "/ - chercher un label" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" -msgstr "d - sauvegarder l'lment courant sur disque dur" +msgstr "d - sauvegarder l'élément courant sur disque dur" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" -msgstr "D,- - dclrer la vitesse d'coute" +msgstr "D,- - réduire la vitesse d'écoute" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" -msgstr "e,. - quitter daisy-player, marquer et jecter" +msgstr "e,. - quitter daisy-player, placer un marqueur et éjecter" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" -"f - trouvez l'lment en cours de diffusion et y placer le " +"f - trouver l'élément en cours de diffusion et y placer le " "curseur" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" -msgstr "g - aller l'endroit (MM:SS) dans le morceau" +msgstr "g - aller au temps (MM:SS) dans le morceau" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" -msgstr "g - aller l'endroit (MM:SS) dans l'lment" +msgstr "g - aller au temps (MM:SS) dans cet élément" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" -msgstr "G - aller la page numro" +msgstr "G - aller à la page numéro" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" -msgstr "h,? - afficher cette page d'aide" +msgstr "h,? - afficher cette page d'aide" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" -msgstr "j,5 - couter uniquement l'lment courant" +msgstr "j,5 - écouter uniquement l'élément courant" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" -msgstr "l - passer au niveau suivant" +msgstr "l - aller au niveau suivant" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" -msgstr "L - revenir au niveau prcdent" +msgstr "L - remonter au niveau précédent" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" -msgstr "n - rechercher dans la suite" +msgstr "n - rechercher plus loin" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" -msgstr "N - recherche inverse" +msgstr "N - rechercher avant" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" -msgstr "o - slectionner la sortie carte son suivante" +msgstr "o - sélectionner la carte son suivante" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" -msgstr "p - placer un marqueur" +msgstr "p - placer un marqueur" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" -msgstr "q - quitter daisy-player et placer un marqueur" +msgstr "q - quitter daisy-player et placer un marqueur" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" -msgstr "s - arrter l'coute" +msgstr "s - arrêter l'écoute" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" -msgstr "U,+ - acclrer la vitesse d'coute" +msgstr "U,+ - accélérer la vitesse d'écoute" + +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - baisser le volume d'écoute" -#: src/daisy-player.c:833 +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - remonter le volume d'écoute" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." -msgstr "Appuyer sur une touche pour quitter l'aide..." +msgstr "Appuyez sur une touche pour quitter l'aide..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Un instant svp... -----------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Que recherchez-vous? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Aller la page numro: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Allez la position (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Slectionnez la carte son:" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Que recherchez-vous?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Ne sait pas lire /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Aller au temps (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Version %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUtilisation: %s [rpertoire avec structure Daisy] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "" +"Utilisation: %s [-l langue] [répertoire avec structure Daisy] | [archive " +"livre Daisy]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" -msgstr "[-c unit_cdrom] [-d unit_son_ALSA]" +msgstr "[-c unité de lecture cdrom] [-d unité de son Alsa]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." -msgstr "Ne sait pas lire /proc/mounts." +msgstr "Je ne sais pas lire /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" -msgstr "Une application pour couter des CD's Daisy sous Linux" +msgstr "Une application pour écouter des CD's Daisy sous Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." -msgstr "Scruter la prsence d'un CD Daisy..." +msgstr "Détection d'un CD Daisy..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" -msgstr "PAS DE CD DAISY ni de CD Audio prsent" +msgstr "Pas de CD Daisy ou audio détecté..." -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Pas de CD Daisy dans le lecteur." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "CD Audio trouv. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "CD audio détecté." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." -msgstr "Consultation des titres sur freedb.freedb.org..." +msgstr "Rapatriement des titres par freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Version %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Version %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Appuyez sur 'h' pour obtenir de l'aide " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Ne sait pas lire le type: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Appuyez sur 'h' pour obtenir de l'aide" Binary files differ@@ -1,6 +1,6 @@ # message catalog file for daisy-player - Hungarian version # -# Copyright (C) 2003-2015 J. Lemmens +# Copyright (C) 2003-2017 J. Lemmens # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -16,257 +16,291 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# translated by Hammer Attila <hammera@pickup.hu> +# translated by JimmiXzSq <jimos45812rt1@hotmail.com> +# some lines are translated with "trans -b en:hu" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-12-09 11:06+0200\n" -"Last-Translator: Hammer Attila <hammera@pickup.hu>\n" -"Language-Team: Hammer Attila <hammera@pickup.hu>\n" +"Last-Translator: JimmiXzSq <jimos45812rt1@hotmail.com>\n" +"Language-Team: JimmiXzSq <jimos45812rt1@hotmail.com>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "Az eBook-speaker nem tudja kezelni ezt a fájlt." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" -msgstr "A(z) %s nem olvasható" +msgstr "A(z) %s nem olvasható" + +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "" +"Kérjük, próbálja meg játszani ezt a könyvet a daisy-player segítségével" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Nem lehet olvasni a típus: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Ugrás az oldalszámra:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Kérlek várj..." -#: src/daisy-player.c:434 +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Válasszon hangkártya:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "A /proc/asound/cards fájl nem olvasható." + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Ez a könyv nincs hang. Játszani ezt a könyvet eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "jicLbQdR" + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "iihdprvBoJep" + +#: src/daisy-player.c:306 msgid "'h' for help -" -msgstr "h =segítség" +msgstr "h =segÃtség" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " Oldalak száma: %d " +msgid "%d pages" +msgstr "Oldalak száma: %d" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " %d szint a %d szintből " +msgid "level: %d of %d" +msgstr "%d szint a %d szintbÅl" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " Összidő: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "ÃsszidÅ: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" -msgstr "A következő parancsok érhetők el ebben a verzióban:" +msgstr "A következÅ parancsok érhetÅk el ebben a verzióban:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" -msgstr "Le,2 - a kurzor mozgatása a következő elemre" +msgstr "Le,2 - a kurzor mozgatása a következÅ elemre" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" -msgstr "Fel,8 - a kurzor mozgatása az előző elemre" +msgstr "Fel,8 - a kurzor mozgatása az elÅzÅ elemre" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" -msgstr "Jobbra,6 - a következő kifejezés kihagyása" +msgstr "Jobbra,6 - a következÅ kifejezés kihagyása" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" -msgstr "Balra,4 - az előző kifejezés kihagyása" +msgstr "Balra,4 - az elÅzÅ kifejezés kihagyása" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" -msgstr "PAGEDOWN,3 - a következő oldal megtekintése" +msgstr "PAGEDOWN,3 - a következÅ oldal megtekintése" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" -msgstr "PAGEUP,9 - az előző oldal megtekintése" +msgstr "PAGEUP,9 - az elÅzÅ oldal megtekintése" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" -msgstr "ENTER - a lejátszás megkezdése" +msgstr "ENTER - a lejátszás megkezdése" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" -msgstr "SZÓKÖZ,0 - a lejátszás szüneteltetése és folytatása" +msgstr "SZÃKÃZ,0 - a lejátszás szüneteltetése és folytatása" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" -msgstr "HOME,* - lejátszás normál sebességgel" +msgstr "HOME,* - lejátszás normál sebességgel" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." -msgstr "A következő oldalra lépéshez nyomjon meg egy billentyűt..." +msgstr "A következÅ oldalra lépéshez nyomjon meg egy billentyűt..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" -msgstr "/ - egy címke keresése" +msgstr "/ - egy cÃmke keresése" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" -msgstr "d - az aktuális elem tárolása a lemezre" +msgstr "d - az aktuális elem tárolása a lemezre" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" -msgstr "D,- - lejátszás sebességének csökkentése" +msgstr "D,- - lejátszás sebességének csökkentése" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" -msgstr "" +msgstr "e,. - kilép daisy-player, beletenni egy könyvjelzÅt, és kiadja" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" -"f - az aktuálisan játszott elem helyének megkeresése, és a kurzor " -"elhelyezése az elem helyére" +"f - az aktuálisan játszott elem helyének megkeresése, és a " +"kurzor elhelyezése az elem helyére" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" -msgstr "g - ugrás egy megadott időre a zeneszámon belül" +msgstr "g - ugrás egy megadott idÅre a zeneszámon belül" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" -msgstr "g - ugrás egy megadott időre a zeneszámon belül" +msgstr "g - ugrás egy megadott idÅre a zeneszámon belül" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "" -"G - ugrás egy megadott oldalra, ha a Daisy könyv tartalmaz oldalszámokat" +"G - ugrás egy megadott oldalra, ha a Daisy könyv tartalmaz " +"oldalszámokat" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" -msgstr "h,? - a súgó megjelenítése" +msgstr "h,? - a súgó megjelenÃtése" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" -msgstr "j,5 - az aktuális elem újbóli lejátszása" +msgstr "j,5 - az aktuális elem újbóli lejátszása" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" -msgstr "l - váltás a következő szintre" +msgstr "l - váltás a következÅ szintre" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" -msgstr "L - váltás az előző szintre" +msgstr "L - váltás az elÅzÅ szintre" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" -msgstr "n - a következő kifejezés keresése" +msgstr "n - a következÅ kifejezés keresése" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" -msgstr "N - az előző kifejezés keresése" +msgstr "N - az elÅzÅ kifejezés keresése" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" -msgstr "o - a következő hangeszköz kiválasztása" +msgstr "o - a következÅ hangeszköz kiválasztása" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" -msgstr "p - könyvjelző elhelyezése" +msgstr "p - könyvjelzÅ elhelyezése" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" -msgstr "" -"q - kilépés a Daisy lejátszóból. A kilépéskor könyvjelző kerül " -"elhelyezésre" +msgstr "q - kilép daisy-player és helyezzük egy könyvjelzÅt" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" -msgstr "s - a lejátszás leállítása" +msgstr "s - a lejátszás leállÃtása" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" -msgstr "U,+ - lejátszás sebességének növelése" - -#: src/daisy-player.c:833 -msgid "Press any key to leave help..." -msgstr "A súgó elhagyásához nyomjon meg egy billentyűt..." +msgstr "U,+ - lejátszás sebességének növelése" -#: src/daisy-player.c:1065 -msgid "Please wait... -------------------------" -msgstr "Kérem várjon..." +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - csökkentheti lejátszási hangerÅ" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Mit keres? " +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - növelése lejátszás mennyiség (vigyázat a túlvezérlés)" -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Ugrás a megadott oldalra: " +#: src/daisy-player.c:670 +msgid "Press any key to leave help..." +msgstr "A súgó elhagyásához nyomjon meg egy billentyűt..." -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Ugrás egy megadott időtartamra: " +#: src/daisy-player.c:817 +msgid "Please wait... -------------------------" +msgstr "Kérem várjon..." -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Mit keres?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "A /proc/asound/cards fájl nem olvasható." +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Ugrás egy megadott idÅtartamra:" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" -msgstr "Daisy-player - %s verzió %s" +msgstr "Daisy-player - %s verzió %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sHasználat: %s [Daisy szerkezetet tartalmazó könyvtár] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "" +"Használat: %s [Daisy szerkezetet tartalmazó könyvtár] | " +"[Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" -msgstr "[-c CD-rom eszköz] [-d ALSA hangeszköz]" +msgstr "[-c CD-rom eszköz] [-d ALSA hangeszköz]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." -msgstr "A /proc csatolások nem olvashatók." +msgstr "A /proc csatolások nem olvashatók." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "" -"Egy feldolgozó program, melynek segítségével Daisy könyveket játszhat le " -"Linux alatt" +"Egy feldolgozó program, melynek segÃtségével Daisy könyveket játszhat " +"le Linux alatt" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." -msgstr "DAISY CD keresése..." +msgstr "DAISY CD keresése..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" -msgstr "Nem található DAISY CD vagy audio CD a meghajtóban." +msgstr "Nem található DAISY CD vagy audio CD a meghajtóban." -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." -msgstr "A meghajtóban nincs Daisy lemez." +msgstr "A meghajtóban nincs Daisy lemez." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Az audio CD megtalálva. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Az audio CD megtalálva." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." -msgstr "A számcímek lekérése a freedb.freedb.org kiszolgálóról..." +msgstr "A számcÃmek lekérése a freedb.freedb.org kiszolgálóról..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - %s verzió - (C)2015 J. Lemmens" - -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "A segítségért nyomja meg a H billentyűt. " +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - %s verzió - (C)2017 J. Lemmens" -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "A(z) %d típus nem olvasható" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "A segÃtségért nyomja meg a H billentyűt." diff --git a/po/ml.gmo b/po/ml.gmo Binary files differnew file mode 100644 index 0000000..127a042 --- /dev/null +++ b/po/ml.gmo diff --git a/po/ml.po b/po/ml.po new file mode 100644 index 0000000..00cdcf8 --- /dev/null +++ b/po/ml.po @@ -0,0 +1,296 @@ +# message catalog file for daisy-player - Malayalam version +# +# Copyright (C) 2003-2015 J. Lemmens +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by 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 General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# translated by Sreelakshmi R V <sreelakshmi.rv@gmail.com> +msgid "" +msgstr "" +"Project-Id-Version: gettext 0.11.2\n" +"Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" +"PO-Revision-Date: 2015-02-17 17:06+0200\n" +"Last-Translator: Sreelakshmi R V <sreelakshmi.rv@gmail.com>\n" +"Language-Team: Sreelakshmi R V <sreelakshmi.rv@gmail.com>\n" +"Language: ml\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "" + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 +#, c-format +msgid "Cannot read %s" +msgstr "%s വായിക്കാൻ കഴിയുന്നില്ല " + +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "പേജ് നമ്പറിലേക്ക് പോവുക" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "" + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "ഒരു സൌണ്ട്കാർഡ് തിരഞ്ഞെടുക്കുക :" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr " /proc/asound/cards വായിക്കാൻ കഴിയുന്നില്ല" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "ഈ പുസ്തകത്തിന് ഓഡിയോ ലഭ്യമല്ല. eBook-speaker ഉപയോഗിചു ഇത് കേൾക്കാവുന്നതാണ് ." + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "" + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "" + +#: src/daisy-player.c:306 +msgid "'h' for help -" +msgstr "സഹായത്തിനായി 'h' അമർത്തുക " + +#: src/daisy-player.c:310 +#, c-format +msgid "%d pages" +msgstr "%d പേജുകൾ" + +#: src/daisy-player.c:315 +#, c-format +msgid "level: %d of %d" +msgstr "ലെവൽ : %d ൽ %d" + +#: src/daisy-player.c:323 +#, c-format +msgid "total length: %02d:%02d:%02d" +msgstr "ആകെ ദൈർഘ്യം : %02d:%02d:%02d" + +#: src/daisy-player.c:597 +msgid "These commands are available in this version:" +msgstr "ഈ കമാൻഡുകൾ ഈ പതിപ്പിൽ ലഭ്യമാണ് :" + +#: src/daisy-player.c:601 +msgid "cursor down,2 - move cursor to the next item" +msgstr "cursor down,2 - അടുത്ത ഇനത്തിലേക്ക് കഴ്സർ നീക്കുക" + +#: src/daisy-player.c:603 +msgid "cursor up,8 - move cursor to the previous item" +msgstr "cursor up ,8 - മുൻ ഇനത്തിലേക്ക് കഴ്സർ നീക്കുക" + +#: src/daisy-player.c:605 +msgid "cursor right,6 - skip to next phrase" +msgstr "cursor right ,6 - അടുത്ത പദത്തിലേക്ക് കടക്കുക" + +#: src/daisy-player.c:607 +msgid "cursor left,4 - skip to previous phrase" +msgstr "cursor left,4 - മുമ്പത്തെ പദത്തിലേക്ക് കടക്കുക" + +#: src/daisy-player.c:609 +msgid "page-down,3 - view next page" +msgstr "page-down,3 - അടുത്ത പേജ് കാണുക " + +#: src/daisy-player.c:611 +msgid "page-up,9 - view previous page" +msgstr "page-up,9 - മുൻ പേജ് കാണുക" + +#: src/daisy-player.c:613 +msgid "enter - start playing" +msgstr "enter - ഫയൽ പ്ലേ ചെയ്തു തുടങ്ങുക" + +#: src/daisy-player.c:615 +msgid "space,0 - pause/resume playing" +msgstr "space ,0 - പ്ലേ ചെയ്തു കൊണ്ടിരിക്കുന്ന ഫയൽ നിർത്തുക / പുനരാരംഭിക്കുക" + +#: src/daisy-player.c:617 +msgid "home,* - play on normal speed" +msgstr "home ,* - സാധാരണ വേഗത്തിൽ പ്ലേ ചെയ്യുക" + +#: src/daisy-player.c:619 +msgid "Press any key for next page..." +msgstr "അടുത്ത പേജിനു വേണ്ടി ഏതെങ്കിലും കീ അമർത്തുക ..." + +#: src/daisy-player.c:625 +msgid "/ - search for a label" +msgstr "/ - ലേബൽ തിരയുക" + +#: src/daisy-player.c:627 +msgid "d - store current item to disk" +msgstr "d - നിലവിലെ ഇനം ഡിസ്കിൽ സൂക്ഷിക്കുക" + +#: src/daisy-player.c:629 +msgid "D,- - decrease playing speed" +msgstr "D,- - പ്ലേ ചെയുന്ന വേഗത കുറയ്ക്കുക" + +#: src/daisy-player.c:631 +msgid "e,. - quit daisy-player, place a bookmark and eject" +msgstr "e,. - ഫയൽ ബുക്ക്മാർക്ക് ചെയ്തു daisy-player ക്ലോസ് ചെയ്യുക " + +#: src/daisy-player.c:633 +msgid "" +"f - find the currently playing item and place the cursor there" +msgstr "f - ഇപ്പോൾ പ്ലേ ചെയ്യുന്ന ഐറ്റം കണ്ടെത്തി അതിൽ കർസർ വയ്ക്കുക" + +#: src/daisy-player.c:636 +msgid "g - go to time in this song (MM:SS)" +msgstr "g - ഈ ഗാനത്തിന്റെ (MM:SS) സമയത്തിലേക്ക് പോകുക" + +#: src/daisy-player.c:639 +msgid "g - go to time in this item (MM:SS)" +msgstr "g - ഈ ഇനത്തിന്റെ (MM:SS) സമയത്തിലേക്ക് പോകുക" + +#: src/daisy-player.c:642 +msgid "G - go to page number" +msgstr "G - പേജ് നമ്പറിലേക്ക് പോകുക" + +#: src/daisy-player.c:644 +msgid "h,? - give this help" +msgstr "h,? - ഈ ഹെല്പ് ഫയൽ പ്രദർശിപ്പിക്കുക" + +#: src/daisy-player.c:646 +msgid "j,5 - just play current item" +msgstr "j,5 - നിലവിലെ ഇനം പ്ലേ ചെയ്യുക" + +#: src/daisy-player.c:648 +msgid "l - switch to next level" +msgstr "l - അടുത്ത ലെവലിലേക്ക് മാറുക" + +#: src/daisy-player.c:650 +msgid "L - switch to previous level" +msgstr "L - മുൻ നിലയിലേക്ക് മാറുക" + +#: src/daisy-player.c:652 +msgid "n - search forwards" +msgstr "n - മുന്നിലേക്ക് തിരയുക " + +#: src/daisy-player.c:654 +msgid "N - search backwards" +msgstr "N - പുറകോട്ടു്തിരയുക" + +#: src/daisy-player.c:656 +msgid "o - select next output sound device" +msgstr "o - അടുത്ത സൌണ്ട് ഔട്പുട്ട് ഉപകരണം തിരഞ്ഞെടുക്കുക " + +#: src/daisy-player.c:658 +msgid "p - place a bookmark" +msgstr "p - ഒരു ബുക്ക്മാർക്ക് സ്ഥാപിക്കുക" + +#: src/daisy-player.c:660 +msgid "q - quit daisy-player and place a bookmark" +msgstr "q - ഫയൽ ബുക്ക്മാർക്ക് ചെയ്തു daisy-player ക്ലോസ് ചെയ്യുക" + +#: src/daisy-player.c:662 +msgid "s - stop playing" +msgstr "s - ഫയൽ പ്ലേ ചെയ്യുന്നത് നിർത്തുക" + +#: src/daisy-player.c:664 +msgid "U,+ - increase playing speed" +msgstr "U , + - പ്ലേ ചെയുന്ന വേഗത വർധിപിക്കുക" + +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - പ്ലേബാക്ക് ശബ്ദം കുറയ്ക്കുക" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - പ്ലേബാക്ക് ശബ്ദം കൂട്ടുക" + +#: src/daisy-player.c:670 +msgid "Press any key to leave help..." +msgstr "സഹായത്തിനായി ഏതെങ്കിലും കീ അമർത്തുക ..." + +#: src/daisy-player.c:817 +msgid "Please wait... -------------------------" +msgstr "കാത്തിരിക്കൂ... --------------" + +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "നിങ്ങൾ എന്താണ് തിരയുന്നത്" + +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "സമയം (MM:SS) പോവുക :" + +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 +#, c-format +msgid "Daisy-player - Version %s %s" +msgstr "Daisy-player - പതിപ്പ് %s %s" + +#: src/daisy-player.c:1584 +#, c-format +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "ഉപയോഗം: %s [ഡെയിസി_ഘടനയിലുള്ള_ഡയറക്ടറി | ഡെയിസി_പുസ്തക_ശേഖരം ]" + +#: src/daisy-player.c:1586 +msgid "[-c cdrom_device] [-d ALSA_sound_device]" +msgstr "[-c സിഡി റോം ] [-d ALSA_sound_device]" + +#: src/daisy-player.c:1599 +msgid "Cannot read /proc/mounts." +msgstr "/proc/mounts ഫയൽ വായിക്കുവാൻ സാധിക്കുന്നില്ല " + +#: src/daisy-player.c:1793 +msgid "A parser to play Daisy CD's with Linux" +msgstr "ഡെയിസി സിഡി ലിനക്സിൽ പ്രവർത്തിപ്പിക്കുവനുള്ള സംവിധാനം" + +#: src/daisy-player.c:1795 +msgid "Scanning for a Daisy CD..." +msgstr "ഡെയിസി സിഡി യ്ക്കായി തിരയുന്നു" + +#: src/daisy-player.c:1896 src/daisy-player.c:1999 +msgid "No DAISY-CD or Audio-cd found" +msgstr "ഡ്രൈവിൽ ഓഡിയോ സി ഡി യോ ഡെയിസി സി ഡി യോ ലഭ്യമല്ല" + +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 +msgid "No Daisy CD in drive." +msgstr "ഡ്രൈവിൽ ഡെയ്സി സിഡി ഇല്ല" + +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "ഒരു ഓഡിയോ - സിഡി കണ്ടെത്തി " + +#: src/daisy-player.c:1984 +msgid "Get titles from freedb.freedb.org..." +msgstr "" + +#: src/daisy-player.c:2113 +#, c-format +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - പതിപ്പ് %s" + +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "സഹായത്തിനായി 'h' അമർത്തുക " Binary files differ@@ -17,11 +17,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Ellen Rohaan <ellenrohaan@hotmail.com> +# some lines are translated with "trans -b en:nb" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-01-29 15:06+0200\n" "Last-Translator: Ellen <ellenrohaan@hotmail.com>\n" "Language-Team: Ellen <ellenrohaan@hotmail.com>\n" @@ -30,237 +31,270 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker kan ikke håndtere denne filen." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Kan ikke lese %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Vennligst prøv å spille denne boken med daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Kan ikke lese type: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Gå til side nummer:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Vennligst vent..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Velg et lydkort:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Kan ikke lese /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Denne boken har ingen lyd. Spill denne boken med eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Ingen produkter funnet. Prøv alternativet \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Ingen produkter funnet. Prøv alternativet \"-O\"." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' for hjelp -" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d sider " +msgid "%d pages" +msgstr "%d sider" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " nivå: %d of %d " +msgid "level: %d of %d" +msgstr "nivå: %d of %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " total lengde: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "total lengde: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Disse kommandoer er tilgjengelig i denne versjon:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "markør ned,2 - flytt markør til neste element" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "markør opp,8 - flytt markør til forrige element" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "markør til høyre,6 - hopp over til neste settning" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "markør til venstre,4 - hopp over til forrige settning" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - viser neste side" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - viser forrige side" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - begynner å spille" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "space,0 - pauserer/gjennopptar spilling" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - spiller på normal tempo" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Trykk en tilfeldig knapp for neste side..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" -msgstr "/ - søker en etikett" +msgstr "/ - søker en etikett" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" -msgstr "d - oppbevarer gjeldende element til disk" +msgstr "d - oppbevarer gjeldende element til disk" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" -msgstr "D,- - reduserer spille tempo" +msgstr "D ,- - reduserer spille tempo" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "" +"e,. - slutte daisy-player, plassere et bokmerke og løse ut" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" -"f - finner den spillende elementen og plasserer markøren der" +"f - finner den spillende elementen og plasserer " +"markørender" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" -msgstr "g - går til tidspunkt i denne sangen (MM:SS)" +msgstr "g - går til tidspunkt i denne sangen (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" -msgstr "g - går til tidspunkt i denne element (MM:SS)" +msgstr "g - går til tidspunkt i denne element (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" -msgstr "G - går til sidenummer (hvis det finnes)" +msgstr "G - går til sidenummer (hvis det finnes)" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" -msgstr "h,? - viser hjelp" +msgstr "h,? - viser hjelp" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" -msgstr "j,5 - spiller gjeldende element" +msgstr "j,5 - spiller gjeldende element" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" -msgstr "l - går til neste nivå" +msgstr "l - går til neste nivå" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" -msgstr "L - gå til forrige nivål" +msgstr "L - gå til forrige nivål" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" -msgstr "n - søker framover" +msgstr "n - søker framover" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" -msgstr "N - søker omvendt" +msgstr "N - søker omvendt" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" -msgstr "o - selekterer neste lydkart" +msgstr "o - selekterer neste lydkart" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" -msgstr "p - lager en bokmerke" +msgstr "p - lager en bokmerke" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" -msgstr "q - avslutter daisy-player og lager en bokmerke" +msgstr "q - avslutter daisy-player og lager en bokmerke" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" -msgstr "s - stopper å spille" +msgstr "s - stopper å spille" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" -msgstr "U,+ - øker spille tempo" +msgstr "U,+ - øker spille tempo" + +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - redusere avspillingsvolum" -#: src/daisy-player.c:833 +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - øke avspillingsvolumet (pass av rel)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Trykk en tilfeldig knapp for å forlate hjelp..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Vennligst vent.. -------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Hva søker du? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Gå til side nummer: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Gå til tidspunktet (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Hva søker du?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Kan ikke lese /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Gå til tidspunktet (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Versjon %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sForbruk: %s [mappe_med_Daisy-struktur] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Forbruk: %s [mappe_med_Daisy-struktur] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_apparat] [-d ALSA_lyd_apparat]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Kan ikke lese /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Et program for å spille Daisy CD's med Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Søker etter en Daisy CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Ingen DAISY-CD eller Lyd-cd funnet" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Ingen Daisy-cd i spillern." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Funnet en Lyd-CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Funnet en Lyd-CD." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Henter titler fra freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Versjon %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Versjon %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Trykk 'h' for hjelp " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Kan ikke lese type: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Trykk 'h' for hjelp" Binary files differ@@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-01-29 15:06+0200\n" "Last-Translator: Jos Lemmens <jos@jlemmens.nl>\n" "Language-Team: Jos Lemmens <jos@jlemmens.nl>\n" @@ -30,285 +30,318 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker kan dit bestand niet lezen." + # 33 -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Kan %s niet lezen" +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Probeer dit boek met daisy-player af te spelen" + +# 33 +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Kan het type %d niet lezen" + +# 15 +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Ga naar pagina nummer:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Even wachten A.U.B...." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Selecteer een geluikdskaart:" + +# 34 +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Kan /proc/asound/cards niet lezen." + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Dit boek heeft geen audio. Speel dit boek af met eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Geen items gevonden. Probeer optie \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Geen items gevonden. Probeer optie \"-O\"." + # 5 -#: src/daisy-player.c:434 +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' voor hulp -" # 1 -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d pagina's " +msgid "%d pages" +msgstr "%d pagina's" # 3 -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " niveau: %d - %d " +msgid "level: %d of %d" +msgstr "niveau: %d - %d" # 4 -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " totale lengte %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "totale lengte %02d:%02d:%02d" # 38 -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Deze commando's zijn beschikbaar in deze versie" # 41 -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "cursor omlaag,2 - verplaats de cursor naar het volgende item" # 44 -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "cursor omhoog,8 - verplaats de cursor naar het vorige item" # 43 -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "cursor rechts,6 - spring naar de volgende frase" # 42 -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "cursor links,4 - spring naar de vorige frase" # 57 -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - toon de volgende pagina" # 58 -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - toon de vorige pagina" # 46 -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - start afspelen" # 62 -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "spatie,0 - pauze/vervolg het afspelen" # 50 -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - speel af op normale snelheid" # 23 -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Druk op een toets voor de volgende pagina..." # 32 -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - zoek label" # 45 -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - sla huidige item op op schijf" # 11 -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - verlaag afspeel snelheid" # 59 -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "e,. - stop daisy-player,plaats een boekenlegger en eject" # 47 -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" "f - vindt het huidige spelende item en plaats de cursor daar" # 48 -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - ga naar tijd in dit lied" # 48 -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - ga naar tijd in dit item" # 48 -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - ga naar pagina nummer" # 49 -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - toon deze help-pagina" # 51 -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - speel alleen dit item af" # 52 -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - schakel naar het volgende niveau" # 16 -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - schakel naar het vorige niveau" # 53 -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - zoek voorwaarts" # 18 -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - zoek achteruit" # 55 -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - selecteer de volgende geluidskaart" # 56 -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - plaats een boekenlegger" # 59 -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - stop daisy-player en plaats een boekenlegger" # 60 -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - stop het afspelen" # 29 -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - verhoog afspeel snelheid" +# 11 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - verlaag het volume" + +# 29 +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - verhoog het volume (pas op voor oversturing)" + # 37 -#: src/daisy-player.c:833 +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Druk op een toets om dit help-scherm te verlaten..." # 20 -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Even geduld a.u.b.... ------------------" # 30 -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Wat zoekt u? " - -# 15 -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Ga naar pagina nummer: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Ga naar tijd (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Selecteer een geluikdskaart:" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Wat zoekt u?" -# 34 -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Kan /proc/asound/cards niet lezen." +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Ga naar tijd (MM:SS):" # 13 -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Versie %s %s" # 39 -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sGebruik: %s [map met een Daisy-structuur] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Gebruik: %s [map met een Daisy-structuur] | [Daisy_boek_archief]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_apparaat] [-d ALSA_geluids_apparaat]" # 34 -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Kan /proc/mounts niet lezen." # 6 -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Een programma om Daisy CD's af te spelen" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Zoeken naar een Daisy CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Geen DAISY-CD of Audio-CD gevonden" # 36 -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Geen daisy-cd in speler." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Een Audio-CD gevonden. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Een Audio-CD gevonden." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Haal de titels op bij freedb.freedb.org..." # 13 -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Versie %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Versie %s - (C)2017 J. Lemmens" # 22 -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Druk op'h' voor hulp " - -# 33 -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Kan het type %d niet lezen" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Druk op'h' voor hulp" Binary files differ@@ -17,11 +17,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Patryk Doering <http://www.rekinet.pl> +# some lines are translated with "trans -b en:pl" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2013-01-29 15:06+0200\n" "Last-Translator: Patryk Doering <http://www.rekinet.pl>\n" "Language-Team: Patryk Doering <http://www.rekinet.pl>Language: pl\n" @@ -30,236 +31,267 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker nie może obsłużyć tego pliku." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Nie można odczytać %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Staraj się zagrać w tę książkę z daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Nie można odczytać typ: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Idź do strony numer:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Proszę czekać..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Wybierz kartę dźwiękową:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Nie można odczytać /proc/asound/cards " + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Ta książka nie ma dźwięku. Zagraj w tę książkę z eBook-speakerem" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Nie znaleziono żadnych produktów. Spróbuj opcji \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Nie znaleziono żadnych produktów. Spróbuj opcji \"-O\"." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' o pomoc - " -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d strony " +msgid "%d pages" +msgstr "%d strony" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " Poziom: %d z %d " +msgid "level: %d of %d" +msgstr "Poziom: %d z %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " Długość całkowita: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "Długość całkowita: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Te polecenia są dostępne w tej wersji:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "Kursor w dół,2 - przesuń kursor do następnego elementu" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "Kursor w górę,8 - przesuń kursor do poprzedniej pozycji" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "Kursor w prawo,6 - przejście do następnej frazy" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "Kursor w lewo,4 - przejście do poprzedniej frazy" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - zobacz następną stronę" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - zobacz poprzednią stronę" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "Enter - rozpoczęcie odtwarzania " -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "Space,0 - zatrzymanie odtwarzania " -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "Home,* - odtwarzanie na standardowej prędkości " -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Naciśnij dowolny klawisz na następnej stronie..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - sprawdź etykietę " -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - zapisz aktualną pozycję na dysku " -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - zmniejszenie prędkości odtwarzania " -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" -msgstr "" +msgstr "e,. - zamknij daisy-player, umieść zakładkę i wysunąć" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "f - znajdź element aktualnie odtwarzany i umieść tam kursor " -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - idź do czasu odtwarzania tej pozycji (mm:ss) " -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - idź do czasu odtwarzania tej pozycji (mm:ss) " -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - przejdź do strony numer (jeśli jest) " -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - pomoc " -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - po prostu odtwarza aktualną pozycję " -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - przejście do następnego poziomu " -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "l - przejście do poprzedniego poziomu " -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - wyszukiwanie w przód " -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "n - wyszukiwanie do tyłu " -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - wybierz wyjściowe urządzenie dźwiękowe " -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - umieść zakładkę " -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - wyjście z daisy-playera i umieszczenie zakładki " -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - zatrzymanie odtwarzania " -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - zwiększenie prędkości odtwarzania " -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "V,1 - zmniejszenie głośności odtwarzania" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - zwiększaj głośność odtwarzania (uważaj na przycinanie)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Naciśnij dowolny klawisz, aby opuścić pomoc... " -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Proszę czekać... ------------------------- " -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Czego szukasz? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Idź do strony numer: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Idź do czasu (mm:ss): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Czego szukasz?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Nie można odczytać /proc/asound/cards " +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Idź do czasu (mm:ss):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Wersja %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUżycie: %s [directory_with_a_Daisy-structure] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Użycie: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_device] [-d ALSA_sound_device]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Nie można odczytać /proc/mounts. " -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Parser odtwarza z Daisy CD's i Linuksem" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Skanowanie Daisy CD... " -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "To nie jest Daisy-CD ani Audio-CD. " -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "W napędzie nie ma Daisy-CD. " -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Znaleziono Audio-CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Znaleziono Audio-CD." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Pobierz tytuły z freedb.freedb.org... " -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Wersja %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Wersja %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Naciśnij 'h' jeśli potrzebujesz pomocy " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Nie można odczytać typ: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Naciśnij 'h' jeśli potrzebujesz pomocy" Binary files differ@@ -17,12 +17,13 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Thais Rizzi <thais.rizzi@gmail.com> +# some lines are translated with "trans -b en:pt" # For any comments or suggestions please email <thais.rizzi@gmail.com> msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2014-08-26 15:45+0200\n" "Last-Translator: Thais Rizzi <thais.rizzi@gmail.com>\n" "Language-Team: Thais Rizzi <thais.rizzi@gmail.com>\n" @@ -31,236 +32,267 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "O eBook-speaker não pode lidar com este arquivo." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Não consegue ler %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Por favor, tente jogar este livro com o daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Não conseguer ler tipo: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Vá para a página número:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Por favor, espere..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Selecione uma placa de som:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Não consegue ler /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Este livro não tem áudio. Reproduzir este livro com eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Nenhum item encontrado. Tente a opção \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Nenhum item encontrado. Tente a opção \"-O\"." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' para ajuda -" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d páginas " +msgid "%d pages" +msgstr "%d páginas" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " nível: %d de %d " +msgid "level: %d of %d" +msgstr "nível: %d de %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " comprimento total: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "comprimento total: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Esse comandos estão disponíveis nessa versão:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "cursor para baixo,2 - move o cursor para o próximo item" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "cursor para cima,8 - move o cursor para o item anterior" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "cursor para direita,6 - pula para a proxima frase" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "cursor para esquerda,4 - pula para a frase anterior" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "page-down,3 - ver página seguinte" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "page-up,9 - ver página anterior" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - comece a reprodução" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "espaço,0 - pausa/ resumir reprodução" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - reproduzir em velocidade normal" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Pressione qualquer tecla para a próxima pagina..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - procure por uma etiqueta" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - armazena o item atual no disco" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - diminui a velocidade da reprodução" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" -msgstr "" +msgstr "e,. - sair do daisy-player, colocar um marcador e ejetar" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "f - procura o item atual de reprodução e colocar o cursor lá" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - vai para determinado tempo nessa musica (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - vai para determinado tempo nessa item (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - vai para o número de pagina (se tiver algum)" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - dê essa ajuda" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - só reproduza o item atual" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - mude para o proximo nível" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - mude para o nível anterior" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - procure a frente " -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - procure para trás" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - selecione o próximo dispositivo de saída de som" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - coloque o marcador" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - saia do daisy-player e coloque o marcador" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - pare de reproduzir" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - aumente a velocidade de reprodução" -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - diminuir o volume de reprodução" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - aumentar o volume de reprodução (cuidado com Clipping)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Aperte qualquer tecla para sair da ajuda..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Por favor espere ... -------------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "O que você procura? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Vá para a página número: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Vá para o tempo (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "O que você procura?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Não consegue ler /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Vá para o tempo (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Versão %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUso: %s [diretório_com_estrutura_Daisy] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Uso: %s [diretório_com_estrutura_Daisy] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[ -c cdrom_dispositivo] [-d ALSA_dispositivo_de_som] [-n | -y]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Não consegue ler /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Um analisador para reproduzir Daisy CD's com o Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Procurando por um CD Daisy..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Nenhum CD DAISY ou CD de áudio identificado" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Nenhum CD Daisy no drive." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "CD de áudio identificado. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "CD de áudio identificado." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Pegar títulos do freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Versão %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Versão %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Pressione 'h' para ajuda " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Não conseguer ler tipo: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Pressione 'h' para ajuda" Binary files differ@@ -1,6 +1,6 @@ # message catalog file for daisy-player - Slovenian version # -# Copyright (C) 2003-2015 J. Lemmens +# Copyright (C) 2003-2017 J. Lemmens # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -17,11 +17,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Tadej Čepin <tadej.cepin@gmail.com> +# some lines are translated with "trans -b en:sl" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2015-02-17 17:06+0200\n" "Last-Translator: Tadej Čepin <tadej.cepin@gmail.com>\n" "Language-Team: Tadej Čepin <tadej.cepin@gmail.com>\n" @@ -30,238 +31,269 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker ne more ravnati s to datoteko." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Ne morem prebrati %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Prosimo, poskusite igrati to knjigo z daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Ne morem prebrati zvrsti: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Pojdi na stran s številko:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Prosim počakaj..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Izberi zvočno kartico:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Ne morem prebrati /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Ta knjiga nima zvoka. Igraj to knjigo z eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Ni elementov. Poskusite z možnostjo \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Ni elementov. Poskusite z možnostjo \"-O\"." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' za pomoč -" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d strani " +msgid "%d pages" +msgstr "%d strani" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " nivo: %d od %d " +msgid "level: %d of %d" +msgstr "nivo: %d od %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " skupna dolžina: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "skupna dolžina: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "V tej različici so na voljo naslednji ukazi:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "puščica navzdol,2 - premakni utripalko na naslednji element" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "puščica navzgor,8 - premakni utripalko na predhodni element" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "puščica desno,6 - skoči na naslednjo frazo" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "puščica levo,4 - skoči na predhodno frazo" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "stran-dol,3 - pokaži naslednjo stran" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "stran-gor,9 - pokaži predhodno stran" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - začni predvajanje" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "preslednica,0 - zaustavi/nadaljuj predvajanje" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "domov,* - predvajaj z običajno hitrostjo" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Za prehod na naslednjo stran pritisni katerokoli tipko..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - poišči etiketo" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - shrani trenutni element na disk" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - zmanjšaj hitrost predvajanja" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "" "e,. - izhod iz predvajalnika DAISY, nastavi zaznamek in izvrzi " -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "" "f - najdi trenutno predvajan predmet in nanj postavi utripalko" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - pojdi na čas v tej skladbi (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - pojdi na čas v tej skladbi (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - pojdi na stran s številko" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - podaj to pomoč" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - samo predvajaj trenutni element" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - preklopi na naslednji nivo" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - preklopi na prejšnji nivo" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - išči naprej" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - išči nazaj" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - izberi naslednjo izhodno zvočno napravo" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - postavi zaznamek" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - zapusti predvajalnik DAISY in postavi zaznamek" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - zaustavi predvajanje" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - povečaj hitrost predvajanja" -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - zmanjša predvajanja glasnosti" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - povečanje predvajanja volumen (pazi Clipping)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Za izhod iz menija pomoči pritisni katerokoli tipko..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Prosim počakaj... -------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Kaj iščeš? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Pojdi na stran s številko: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Pojdi na čas (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Izberi zvočno kartico:" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Kaj iščeš?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Ne morem prebrati /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Pojdi na čas (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Verzija %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sUporaba: %s [imenik_s_strukturo-DAISY] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Uporaba: %s [imenik_s_strukturo-DAISY] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_naprava] [-d ALSA_zvočna_naprava]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Ne morem prebrati /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Razčlenjevalnik, ki predvaja DAISY CD-je na Linux-u" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Iščem DAISY CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Nisem našel nobenega DAISY CD-ja ali zvočnega CD-ja." -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "V pogonu ni DAISY CD-ja." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Našel sem zvočni CD. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Našel sem zvočni CD." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Pridobi naslove iz freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Verzija %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Verzija %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Za pomoč pritisni tipko 'h' " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Ne morem prebrati zvrsti: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Za pomoč pritisni tipko 'h'" Binary files differ@@ -17,11 +17,12 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # # translated by Kim Nilsson <kim.nilsson@no-substitute.com> +# some lines are translated with "trans -b en:sv" msgid "" msgstr "" "Project-Id-Version: gettext 0.11.2\n" "Report-Msgid-Bugs-To: <jos@jlemmens.nl>\n" -"POT-Creation-Date: 2015-05-30 16:30+0200\n" +"POT-Creation-Date: 2017-06-28 10:28+0200\n" "PO-Revision-Date: 2014-12-03 15:06+0200\n" "Last-Translator: Kim Nilsson <kim.nilsson@no-substitute.com>\n" "Language-Team: Kim Nilsson <kim.nilsson@no-substitute.com>\n" @@ -30,237 +31,268 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/daisy-player.c:225 src/daisy-player.c:252 src/daisy-player.c:324 -#: src/daisy-player.c:503 src/daisy-player.c:1278 src/daisy-player.c:1337 -#: src/daisy-player.c:2042 src/daisy-player.c:2069 src/daisy-player.c:2380 -#: src/daisy3.c:395 src/daisy3.c:448 src/daisy3.c:494 src/daisy3.c:565 -#: src/daisy3.c:609 src/daisy3.c:630 src/daisy3.c:707 src/daisy3.c:837 +#: src/common.c:91 +msgid "eBook-speaker cannot handle this file." +msgstr "eBook-speaker kan inte hantera den här filen." + +#: src/common.c:449 src/common.c:525 src/daisy2.02.c:45 src/daisy2.02.c:197 +#: src/daisy3.c:156 src/daisy3.c:225 src/daisy3.c:322 src/daisy3.c:402 +#: src/daisy3.c:502 src/daisy3.c:655 src/daisy3.c:712 src/daisy3.c:803 +#: src/daisy3.c:878 src/daisy3.c:1099 src/daisy3.c:1229 src/daisy-player.c:731 +#: src/daisy-player.c:1634 src/daisy-player.c:1663 src/daisy-player.c:2040 #, c-format msgid "Cannot read %s" msgstr "Kan ej läsa %s" -#: src/daisy-player.c:434 +#: src/common.c:690 +msgid "Please try to play this book with daisy-player" +msgstr "Försök att spela den här boken med daisy-player" + +#: src/common.c:1023 +#, c-format +msgid "Cannot read type: %d" +msgstr "Kan inte läsa typ: %d" + +#: src/common.c:1097 +msgid "Go to page number:" +msgstr "Gå till sidnummer:" + +#: src/common.c:1115 +msgid "Please wait..." +msgstr "Vänta..." + +#: src/common.c:1175 +msgid "Select a soundcard:" +msgstr "Välj ett ljudkort:" + +#: src/common.c:1177 +msgid "Cannot read /proc/asound/cards" +msgstr "Kan inte läsa /proc/asound/cards" + +#: src/daisy3.c:1053 src/daisy-player.c:798 src/daisy-player.c:1110 +msgid "This book has no audio. Play this book with eBook-speaker" +msgstr "Den här boken har inget ljud. Spela denna bok med eBook-speaker" + +#: src/daisy3.c:1069 +msgid "No items found. Try option \"-N\"." +msgstr "Inga föremål hittades. Prova alternativet \"-N\"." + +#: src/daisy3.c:1209 +msgid "No items found. Try option \"-O\"." +msgstr "Inga föremål hittades. Prova alternativet \"-O\"." + +#: src/daisy-player.c:306 msgid "'h' for help -" msgstr "'h' för hjälp -" -#: src/daisy-player.c:436 +#: src/daisy-player.c:310 #, c-format -msgid " %d pages " -msgstr " %d sidor " +msgid "%d pages" +msgstr "%d sidor" -#: src/daisy-player.c:437 +#: src/daisy-player.c:315 #, c-format -msgid " level: %d of %d " -msgstr " nivå: %d av %d " +msgid "level: %d of %d" +msgstr "nivå: %d av %d" -#: src/daisy-player.c:443 +#: src/daisy-player.c:323 #, c-format -msgid " total length: %02d:%02d:%02d " -msgstr " total längd: %02d:%02d:%02d " +msgid "total length: %02d:%02d:%02d" +msgstr "total längd: %02d:%02d:%02d" -#: src/daisy-player.c:764 +#: src/daisy-player.c:597 msgid "These commands are available in this version:" msgstr "Dessa kommando är tillgängliga i denna version:" -#: src/daisy-player.c:768 +#: src/daisy-player.c:601 msgid "cursor down,2 - move cursor to the next item" msgstr "pil ner,2 - gå till nästa rad" -#: src/daisy-player.c:770 +#: src/daisy-player.c:603 msgid "cursor up,8 - move cursor to the previous item" msgstr "pil upp,8 - gå till föregående rad" -#: src/daisy-player.c:772 +#: src/daisy-player.c:605 msgid "cursor right,6 - skip to next phrase" msgstr "pil höger,6 - hoppa till nästa fras" -#: src/daisy-player.c:774 +#: src/daisy-player.c:607 msgid "cursor left,4 - skip to previous phrase" msgstr "pil vänster,4 - hoppa til föregående fras" -#: src/daisy-player.c:776 +#: src/daisy-player.c:609 msgid "page-down,3 - view next page" msgstr "pgdn,3 - visa nästa sida" -#: src/daisy-player.c:778 +#: src/daisy-player.c:611 msgid "page-up,9 - view previous page" msgstr "pgup,9 - visa föregående sida" -#: src/daisy-player.c:780 +#: src/daisy-player.c:613 msgid "enter - start playing" msgstr "enter - börja spela" -#: src/daisy-player.c:782 +#: src/daisy-player.c:615 msgid "space,0 - pause/resume playing" msgstr "mellanslag,0 - pausa/starta igen" -#: src/daisy-player.c:784 +#: src/daisy-player.c:617 msgid "home,* - play on normal speed" msgstr "home,* - spela i normal hastighet" -#: src/daisy-player.c:786 +#: src/daisy-player.c:619 msgid "Press any key for next page..." msgstr "Tryck valfri tangent för nästa sida..." -#: src/daisy-player.c:792 +#: src/daisy-player.c:625 msgid "/ - search for a label" msgstr "/ - sök efter etikett" -#: src/daisy-player.c:794 +#: src/daisy-player.c:627 msgid "d - store current item to disk" msgstr "d - spara aktuell rad till fil" -#: src/daisy-player.c:796 +#: src/daisy-player.c:629 msgid "D,- - decrease playing speed" msgstr "D,- - sänk läshastigheten" -#: src/daisy-player.c:798 +#: src/daisy-player.c:631 msgid "e,. - quit daisy-player, place a bookmark and eject" msgstr "" "e,. - stäng av daisy-player, spara ett bokmärke och knuffa ut CD:n" -#: src/daisy-player.c:800 +#: src/daisy-player.c:633 msgid "" "f - find the currently playing item and place the cursor there" msgstr "f - hitta det aktuella spåret och vänta där" -#: src/daisy-player.c:803 +#: src/daisy-player.c:636 msgid "g - go to time in this song (MM:SS)" msgstr "g - gå till viss tid i detta spår (MM:SS)" -#: src/daisy-player.c:806 +#: src/daisy-player.c:639 msgid "g - go to time in this item (MM:SS)" msgstr "g - gå till viss tid i detta spår (MM:SS)" -#: src/daisy-player.c:809 +#: src/daisy-player.c:642 msgid "G - go to page number" msgstr "G - gå till sidnummer" -#: src/daisy-player.c:811 +#: src/daisy-player.c:644 msgid "h,? - give this help" msgstr "h,? - visa denna hjälp" -#: src/daisy-player.c:813 +#: src/daisy-player.c:646 msgid "j,5 - just play current item" msgstr "j,5 - bara spela aktuellt spår" -#: src/daisy-player.c:815 +#: src/daisy-player.c:648 msgid "l - switch to next level" msgstr "l - byta till nästa nivå" -#: src/daisy-player.c:817 +#: src/daisy-player.c:650 msgid "L - switch to previous level" msgstr "L - byta till föregående nivå" -#: src/daisy-player.c:819 +#: src/daisy-player.c:652 msgid "n - search forwards" msgstr "n - sök framåt" -#: src/daisy-player.c:821 +#: src/daisy-player.c:654 msgid "N - search backwards" msgstr "N - sök bakåt" -#: src/daisy-player.c:823 +#: src/daisy-player.c:656 msgid "o - select next output sound device" msgstr "o - välj nästa ljudenhet" -#: src/daisy-player.c:825 +#: src/daisy-player.c:658 msgid "p - place a bookmark" msgstr "p - spara ett bokmärke" -#: src/daisy-player.c:827 +#: src/daisy-player.c:660 msgid "q - quit daisy-player and place a bookmark" msgstr "q - stäng av daisy-player och spara ett bokmärke" -#: src/daisy-player.c:829 +#: src/daisy-player.c:662 msgid "s - stop playing" msgstr "s - sluta spela" -#: src/daisy-player.c:831 +#: src/daisy-player.c:664 msgid "U,+ - increase playing speed" msgstr "U,+ - öka läshastigheten" -#: src/daisy-player.c:833 +#: src/daisy-player.c:666 +msgid "v,1 - decrease playback volume" +msgstr "v,1 - minska uppspelningsvolymen" + +#: src/daisy-player.c:668 +msgid "V,7 - increase playback volume (beware of Clipping)" +msgstr "V,7 - öka uppspelningsvolymen (se upp för klippning)" + +#: src/daisy-player.c:670 msgid "Press any key to leave help..." msgstr "Tryck valfri tangent för att lämna hjälp..." -#: src/daisy-player.c:1065 +#: src/daisy-player.c:817 msgid "Please wait... -------------------------" msgstr "Vänligen vänta... -------------------------" -#: src/daisy-player.c:1161 -msgid "What do you search? " -msgstr "Vad söker du efter? " - -#: src/daisy-player.c:1256 -msgid "Go to page number: " -msgstr "Gå till sidnummer: " - -#: src/daisy-player.c:1392 -msgid "Go to time (MM:SS): " -msgstr "Gå till tid (MM:SS): " - -#: src/daisy-player.c:1452 -msgid "Select a soundcard:" -msgstr "Välj ett ljudkort:" +#: src/daisy-player.c:924 +msgid "What do you search?" +msgstr "Vad söker du efter?" -#: src/daisy-player.c:1454 -msgid "Cannot read /proc/asound/cards" -msgstr "Kan inte läsa /proc/asound/cards" +#: src/daisy-player.c:1025 +msgid "Go to time (MM:SS):" +msgstr "Gå till tid (MM:SS):" -#: src/daisy-player.c:1988 src/daisy-player.c:2177 +#: src/daisy-player.c:1581 src/daisy-player.c:1791 src/daisy-player.c:1809 #, c-format msgid "Daisy-player - Version %s %s" msgstr "Daisy-player - Version %s %s" -#: src/daisy-player.c:1991 +#: src/daisy-player.c:1584 #, c-format -msgid "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] " -msgstr "%sAnvändning: %s [mapp_med_en_Daisy-struktur] " +msgid "Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]" +msgstr "Användning: %s [mapp_med_en_Daisy-struktur] | [Daisy_book_archive]" -#: src/daisy-player.c:1993 +#: src/daisy-player.c:1586 msgid "[-c cdrom_device] [-d ALSA_sound_device]" msgstr "[-c cdrom_enhet] [-d ALSA_ljudenhet]" -#: src/daisy-player.c:2006 +#: src/daisy-player.c:1599 msgid "Cannot read /proc/mounts." msgstr "Kan inte läsa /proc/mounts." -#: src/daisy-player.c:2179 +#: src/daisy-player.c:1793 msgid "A parser to play Daisy CD's with Linux" msgstr "Ett program som spelar Daisy-skivor med Linux" -#: src/daisy-player.c:2181 +#: src/daisy-player.c:1795 msgid "Scanning for a Daisy CD..." msgstr "Letar efter en Daisy-CD..." -#: src/daisy-player.c:2252 src/daisy-player.c:2341 src/daisy3.c:785 -#, c-format +#: src/daisy-player.c:1896 src/daisy-player.c:1999 msgid "No DAISY-CD or Audio-cd found" msgstr "Ingen DAISY-CD eller ljud-cd hittad" -#: src/daisy-player.c:2282 src/daisy-player.c:2289 src/daisy-player.c:2311 +#: src/daisy-player.c:1925 src/daisy-player.c:1937 src/daisy-player.c:1964 msgid "No Daisy CD in drive." msgstr "Ingen Daisy-CD i CD-spelaren." -#: src/daisy-player.c:2325 -msgid "Found an Audio-CD. " -msgstr "Hittade en ljud-cd. " +#: src/daisy-player.c:1982 +msgid "Found an Audio-CD." +msgstr "Hittade en ljud-cd." -#: src/daisy-player.c:2327 +#: src/daisy-player.c:1984 msgid "Get titles from freedb.freedb.org..." msgstr "Hämtar titlar från freedb.freedb.org..." -#: src/daisy-player.c:2415 +#: src/daisy-player.c:2113 #, c-format -msgid "Daisy-player - Version %s - (C)2015 J. Lemmens" -msgstr "Daisy-player - Version %s - (C)2015 J. Lemmens" +msgid "Daisy-player - Version %s - (C)2017 J. Lemmens" +msgstr "Daisy-player - Version %s - (C)2017 J. Lemmens" -#: src/daisy-player.c:2428 -msgid "Press 'h' for help " -msgstr "Tryck 'h' för hjälp " - -#: src/daisy3.c:324 -#, c-format -msgid "Cannot read type: %d" -msgstr "Kan inte läsa typ: %d" +#: src/daisy-player.c:2126 +msgid "Press 'h' for help" +msgstr "Tryck 'h' för hjälp" diff --git a/py-compile b/py-compile new file mode 100755 index 0000000..bc20391 --- /dev/null +++ b/py-compile @@ -0,0 +1,170 @@ +#!/bin/sh +# py-compile - Compile a Python program + +scriptversion=2011-06-08.12; # UTC + +# Copyright (C) 2000-2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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 General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +if [ -z "$PYTHON" ]; then + PYTHON=python +fi + +me=py-compile + +usage_error () +{ + echo "$me: $*" >&2 + echo "Try '$me --help' for more information." >&2 + exit 1 +} + +basedir= +destdir= +while test $# -ne 0; do + case "$1" in + --basedir) + if test $# -lt 2; then + usage_error "option '--basedir' requires an argument" + else + basedir=$2 + fi + shift + ;; + --destdir) + if test $# -lt 2; then + usage_error "option '--destdir' requires an argument" + else + destdir=$2 + fi + shift + ;; + -h|--help) + cat <<\EOF +Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." + +Byte compile some python scripts FILES. Use --destdir to specify any +leading directory path to the FILES that you don't want to include in the +byte compiled file. Specify --basedir for any additional path information you +do want to be shown in the byte compiled file. + +Example: + py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py + +Report bugs to <bug-automake@gnu.org>. +EOF + exit $? + ;; + -v|--version) + echo "$me $scriptversion" + exit $? + ;; + --) + shift + break + ;; + -*) + usage_error "unrecognized option '$1'" + ;; + *) + break + ;; + esac + shift +done + +files=$* +if test -z "$files"; then + usage_error "no files given" +fi + +# if basedir was given, then it should be prepended to filenames before +# byte compilation. +if [ -z "$basedir" ]; then + pathtrans="path = file" +else + pathtrans="path = os.path.join('$basedir', file)" +fi + +# if destdir was given, then it needs to be prepended to the filename to +# byte compile but not go into the compiled file. +if [ -z "$destdir" ]; then + filetrans="filepath = path" +else + filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" +fi + +$PYTHON -c " +import sys, os, py_compile, imp + +files = '''$files''' + +sys.stdout.write('Byte-compiling python modules...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath), path) + else: + py_compile.compile(filepath, filepath + 'c', path) +sys.stdout.write('\n')" || exit $? + +# this will fail for python < 1.5, but that doesn't matter ... +$PYTHON -O -c " +import sys, os, py_compile, imp + +# pypy does not use .pyo optimization +if hasattr(sys, 'pypy_translation_info'): + sys.exit(0) + +files = '''$files''' +sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') +for file in files.split(): + $pathtrans + $filetrans + if not os.path.exists(filepath) or not (len(filepath) >= 3 + and filepath[-3:] == '.py'): + continue + sys.stdout.write(file) + sys.stdout.flush() + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + else: + py_compile.compile(filepath, filepath + 'o', path) +sys.stdout.write('\n')" 2>/dev/null || : + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/src/Makefile.am b/src/Makefile.am index 7f1868d..92514c9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,11 @@ AM_CFLAGS = -D LOCALEDIR=\"$(prefix)/share/locale\" -Wall -Wextra \ - -Wunused -g -I /usr/include/libxml2/ -O2 -fstack-protector \ + -Wuninitialized -Winit-self -fno-common \ + -g -I /usr/include/libxml2/ -O2 -fstack-protector \ --param=ssp-buffer-size=4 -Wformat -Werror=format-security \ - -Wuninitialized \ -DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\" AM_LDFLAGS = -lncursesw -lsox -lxml2 -lcdio -lcdio_cdda -lcdio_paranoia \ -lmagic bin_PROGRAMS = daisy-player -daisy_player_SOURCES = daisy3.c audiocd.c daisy-player.c paranoia.c daisy.h +daisy_player_SOURCES = daisy.h audiocd.c paranoia.c \ + common.c daisy2.02.c daisy3.c daisy-player.c localedir = $(datadir)/locale diff --git a/src/Makefile.in b/src/Makefile.in index 1574904..1c8f80f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,8 +90,6 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = daisy-player$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -91,14 +99,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am_daisy_player_OBJECTS = daisy3.$(OBJEXT) audiocd.$(OBJEXT) \ - daisy-player.$(OBJEXT) paranoia.$(OBJEXT) +am_daisy_player_OBJECTS = audiocd.$(OBJEXT) paranoia.$(OBJEXT) \ + common.$(OBJEXT) daisy2.02.$(OBJEXT) daisy3.$(OBJEXT) \ + daisy-player.$(OBJEXT) daisy_player_OBJECTS = $(am_daisy_player_OBJECTS) daisy_player_LDADD = $(LDADD) AM_V_P = $(am__v_P_@AM_V@) @@ -155,6 +165,8 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -283,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -292,15 +305,17 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -D LOCALEDIR=\"$(prefix)/share/locale\" -Wall -Wextra \ - -Wunused -g -I /usr/include/libxml2/ -O2 -fstack-protector \ + -Wuninitialized -Winit-self -fno-common \ + -g -I /usr/include/libxml2/ -O2 -fstack-protector \ --param=ssp-buffer-size=4 -Wformat -Werror=format-security \ - -Wuninitialized \ -DPROGRAMNAME_LOCALEDIR=\"${PROGRAMNAME_LOCALEDIR}\" AM_LDFLAGS = -lncursesw -lsox -lxml2 -lcdio -lcdio_cdda -lcdio_paranoia \ -lmagic -daisy_player_SOURCES = daisy3.c audiocd.c daisy-player.c paranoia.c daisy.h +daisy_player_SOURCES = daisy.h audiocd.c paranoia.c \ + common.c daisy2.02.c daisy3.c daisy-player.c + all: all-am .SUFFIXES: @@ -317,7 +332,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -389,7 +403,9 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audiocd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daisy-player.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daisy2.02.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daisy3.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paranoia.Po@am__quote@ @@ -611,6 +627,8 @@ uninstall-am: uninstall-binPROGRAMS ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/audiocd.c b/src/audiocd.c index dd8afd5..3f0304c 100644 --- a/src/audiocd.c +++ b/src/audiocd.c @@ -1,6 +1,6 @@ /* audiocd.c - handle Audio-CD's * - * Copyright (C)2015 J. Lemmens + * Copyright (C)2017 J. Lemmens * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -17,18 +17,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "src/daisy.h" +#include "daisy.h" void get_cddb_info (misc_t *misc, daisy_t *daisy) { FILE *r; - size_t len = MAX_STR; + size_t len = 0; char *str = NULL, cd[MAX_STR + 1]; int i; snprintf (cd, MAX_STR, "cddbget -c %s -I -d 2> /dev/null", misc->cd_dev); r = popen (cd, "r"); - str = malloc (len + 1); i = 0; while (1) { @@ -62,7 +61,8 @@ void get_cddb_info (misc_t *misc, daisy_t *daisy) *strchr (daisy[i].label, '\n') = 0; if (strchr (daisy[i].label, '\r')) *strchr (daisy[i].label, '\r') = 0; - daisy[i].label[64 - daisy[i].x] = 0; + if (strlen (daisy[i].label) - daisy[i].x >= 65) + daisy[i].label[64 - daisy[i].x] = 0; i++; } // if } // while diff --git a/src/common.c b/src/common.c new file mode 100644 index 0000000..9abbf15 --- /dev/null +++ b/src/common.c @@ -0,0 +1,1221 @@ +/* common.c - common functions used by daisy-player and eBook-speaker. + * + * Copyright (C)2017 J. Lemmens + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by 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 General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "daisy.h" + +char *find_index_file (misc_t *misc, char *name, char *search_str) +{ + char *found; + DIR *dir; + struct dirent *entry; + + if (strcasestr (name, search_str) && *search_str) + return name; + if (! (dir = opendir (name))) + failure (misc, name, errno); + if (! (entry = readdir (dir))) + failure (misc, "readdir ()", errno); + do + { + if (strcmp (entry->d_name, ".") == 0 || + strcmp (entry->d_name, "..") == 0) + continue; + if (strcasestr (entry->d_name, search_str) && *search_str) + { + found = malloc (strlen (name) + strlen (entry->d_name) + 5); + sprintf (found, "%s/%s\n", name, entry->d_name); + found[strlen (found) - 1] = 0; + closedir (dir); + return found; + } // if + if (entry->d_type == DT_DIR) + { + char *path; + + if (strcmp (entry->d_name, ".") == 0 || + strcmp (entry->d_name, "..") == 0) + continue; + path = malloc (strlen (name) + strlen (entry->d_name) + 10); + sprintf (path, "%s/%s", name, entry->d_name); + found = malloc (MAX_STR); + strcpy (found, find_index_file (misc, path, search_str)); + if (strcasestr (found, search_str) && *search_str) + return found; + free (path); + } // if + } while ((entry = readdir (dir))); + return ""; +} // find_index_file + +char *get_real_name (misc_t *misc, char *dir, char *name) +{ + char *found; + DIR *DIR; + struct dirent *entry; + + if (! (DIR = opendir (dir))) + failure (misc, name, errno); + if (! (entry = readdir (DIR))) + failure (misc, "readdir ()", errno); + found = strdup (""); + do + { + if (strcasecmp (entry->d_name, name) == 0) + { + found = malloc (strlen (dir) + strlen (entry->d_name) + 5); + sprintf (found, "%s/%s\n", dir, entry->d_name); + found[strlen (found) - 1] = 0; + closedir (DIR); + return found; + } // if + } while ((entry = readdir (DIR))); + endwin (); + beep (); + printf (" \"%s\": %s\n\n", name, strerror (ENOENT)); + printf ("%s\n", gettext ("eBook-speaker cannot handle this file.")); + fflush (stdout); + remove_tmp_dir (misc); + _exit (-1); +} // get_real_name + +char *real_name (misc_t *misc, char *file) +{ +// open file case insensitively + char *dir, *path; + int i, j; + + *misc->str = j = 0; + for (i = 0; i < (int) strlen (file) - 2; i++) + { + if (file[i] == '%' && isxdigit (file[i + 1]) && isxdigit (file[i + 2])) + { + char hex[10]; + + hex[0] = '0'; + hex[1] = 'x'; + hex[2] = file[i + 1]; + hex[3] = file[i + 2]; + hex[4] = 0; + sscanf (hex, "%x", (unsigned int *) &misc->str[j++]); + i += 2; + } + else + misc->str[j++] = file[i]; + } // for + misc->str[j++] = file[i++]; + misc->str[j++] = file[i]; + misc->str[j] = 0; + file = misc->str; + dir = strdup (file); + dir = dirname (dir); + path = get_real_name (misc, dir, basename (file)); + return path; +} // real_name + +void failure (misc_t *misc, char *str, int e) +{ + endwin (); + beep (); + printf ("\n%s: %s\n", str, strerror (e)); + fflush (stdout); + remove_tmp_dir (misc); + _exit (-1); +} // failure + +void skip_left (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ + int just; +#ifdef DAISY_PLAYER + char *prev_id; + + prev_id = misc->prev_id; + if (*prev_id == 0) + { + misc->prev_id = strdup (misc->current_id); + prev_id = misc->prev_id; + } // if +#endif + + just = misc->just_this_item; +#ifdef DAISY_PLAYER + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + return; +#endif + if (misc->playing < 0) + { + beep (); + return; + } // if + if (misc->player_pid > -1) + { + while (kill (misc->player_pid, SIGKILL) != 0); + misc->player_pid = -2; + } // if + if (misc->reader) + xmlTextReaderClose (misc->reader); + if (misc->doc) + xmlFreeDoc (misc->doc); + misc->current = misc->displaying = misc->playing; + misc->current_page_number = daisy[misc->playing].page_number; +#ifdef DAISY_PLAYER + if (strcmp (daisy[misc->playing].first_id, misc->audio_id) == 0) +#endif +#ifdef EBOOK_SPEAKER + if (misc->phrase_nr == 1) +#endif + { + if (misc->playing == 0) + { + beep (); + misc->current = misc->displaying = misc->playing; + unlink (misc->tmp_wav); + unlink ("old.wav"); + misc->current_page_number = daisy[misc->playing].page_number; +#ifdef DAISY_PLAYER + open_clips_file (misc, my_attribute, daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); + misc->current_id = strdup (daisy[misc->playing].first_id); +#endif +#ifdef EBOOK_SPEAKER + open_text_file (misc, my_attribute, daisy[misc->playing].xml_file, + daisy[misc->playing].anchor); + misc->phrase_nr = 0; + misc->player_pid = -2; +#endif + view_screen (misc, daisy); + return; + } // if misc->playing == 0 + + if (misc->just_this_item > -1 && + daisy[misc->playing].level == misc->level) + { + beep (); + misc->current = misc->displaying = misc->playing; + misc->playing = misc->just_this_item = -1; + view_screen (misc, daisy); + wmove (misc->screenwin, daisy[misc->current].y, + daisy[misc->current].x); + return; + } // if + +// go to previous item + misc->current = misc->displaying = --misc->playing; +#ifdef DAISY_PLAYER + open_clips_file (misc, my_attribute, daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); + misc->current_id = strdup (daisy[misc->playing].first_id); + while (1) + { + if (strcmp (daisy[misc->playing].last_id, misc->audio_id) == 0) + break; + get_next_clips (misc, my_attribute, daisy); + } // while + start_playing (misc, daisy); +#endif +#ifdef EBOOK_SPEAKER + open_text_file (misc, my_attribute, + daisy[misc->playing].xml_file, daisy[misc->playing].anchor); + misc->phrase_nr = 0; + while (1) + { + if (! get_tag_or_label (misc, my_attribute, misc->reader)) + return; + if (strcasecmp (misc->tag, "pagenum") == 0 || + strcasecmp (my_attribute->class, "pagenum") == 0) + { + parse_page_number (misc, my_attribute, misc->reader); + } // if + if (! *misc->label) + continue; + if (misc->phrase_nr++ == daisy[misc->playing].n_phrases - 2) + break; + } // while + start_playing (misc, my_attribute, daisy); +#endif + view_screen (misc, daisy); + return; + } // go to previous item + +#ifdef DAISY_PLAYER + open_clips_file (misc, my_attribute, daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); + while (1) + { + if (strcmp (misc->current_id, prev_id) == 0) + { + misc->current = misc->displaying = misc->playing; + misc->just_this_item = just; + start_playing (misc, daisy); + view_screen (misc, daisy); + return; + } // if + misc->prev_id = strdup (misc->audio_id); + get_next_clips (misc, my_attribute, daisy); + } // while +#endif +#ifdef EBOOK_SPEAKER + misc->player_pid = -2; + go_to_phrase (misc, my_attribute, daisy, misc->phrase_nr - 1); + misc->just_this_item = just; +#endif +} // skip_left + +void playfile (misc_t *misc, char *in_file, char *in_type, + char *out_file, char *out_type, char *tempo) +{ + sox_format_t *sox_in, *sox_out; + sox_effects_chain_t *chain; + sox_effect_t *e; + char *args[MAX_STR]; + + sox_globals.verbosity = 0; + sox_globals.stdout_in_use_by = NULL; + sox_init (); + if ((sox_in = sox_open_read (in_file, NULL, NULL, in_type)) == NULL) + { + int e; + + e = errno; + beep (); + endwin (); + printf ("%s: %s\n", in_file, strerror (e)); + fflush (stdout); + remove_tmp_dir (misc); + kill (0, SIGTERM); + } // if + if ((sox_out = sox_open_write (out_file, &sox_in->signal, + NULL, out_type, NULL, NULL)) == NULL) + { + if (strcmp (out_type, "alsa") == 0) + { +// if cannot write to out_file (pulseaudio?), try ALSA default + if ((sox_out = sox_open_write ("default", &sox_in->signal, + NULL, "alsa", NULL, NULL)) == NULL) + { + int e; + + e = errno; + beep (); + endwin (); + printf ("\n%s: %s\n\n", out_file, strerror (e)); + fflush (stdout); + put_bookmark (misc); + strncpy (misc->sound_dev, "hw:0", MAX_STR - 1); + save_xml (misc); + kill (0, SIGTERM); + } // if + } + else + { + int e; + + e = errno; + beep (); + endwin (); + printf ("%s: strerror (%d)\n", out_file, e); + kill (0, SIGTERM); + } // if + } // if + if (strcmp (in_type, "cdda") == 0) + { + sox_in->encoding.encoding = SOX_ENCODING_SIGN2; + sox_in->encoding.bits_per_sample = 16; + sox_in->encoding.reverse_bytes = sox_option_no; + } // if + + chain = sox_create_effects_chain (&sox_in->encoding, &sox_out->encoding); + + e = sox_create_effect (sox_find_effect ("input")); + args[0] = (char *) sox_in, sox_effect_options (e, 1, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); + +/* Don't use the sox trim effect. It works nice, but is far too slow + char str2[MAX_STR]; + snprintf (str, MAX_STR - 1, "%f", misc->clip_begin); + snprintf (str2, MAX_STR - 1, "%f", misc->clip_end - misc->clip_begin); + e = sox_create_effect (sox_find_effect ("trim")); + args[0] = str; + args[1] = str2; + sox_effect_options (e, 2, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); +*/ + + e = sox_create_effect (sox_find_effect ("tempo")); +#ifdef DAISY_PLAYER + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + args[0] = "-m"; + else +#endif + args[0] = "-s"; + args[1] = tempo; + sox_effect_options (e, 2, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); + + e = sox_create_effect (sox_find_effect ("vol")); + snprintf (misc->str, MAX_STR, "%lf", misc->volume); + args[0] = misc->str; + sox_effect_options (e, 1, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); + + e = sox_create_effect (sox_find_effect ("rate")); + snprintf (misc->str, MAX_STR - 1, "%lf", sox_out->signal.rate); + args[0] = misc->str, sox_effect_options (e, 1, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); + + snprintf (misc->str, MAX_STR - 1, "%i", sox_out->signal.channels); + e = sox_create_effect (sox_find_effect ("channels")); + args[0] = misc->str, sox_effect_options (e, 1, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); + + e = sox_create_effect (sox_find_effect ("output")); + args[0] = (char *) sox_out, sox_effect_options (e, 1, args); + sox_add_effect (chain, e, &sox_in->signal, &sox_out->signal); + + sox_flow_effects (chain, NULL, NULL); + sox_delete_effects_chain (chain); + sox_close (sox_out); + sox_close (sox_in); + unlink (in_file); + sox_quit (); + unlink (misc->tmp_wav); +} // playfile + +void player_ended () +{ + wait (NULL); +} // player_ended + +void find_index_names (misc_t *misc) +{ + *misc->ncc_html = 0; + strncpy (misc->ncc_html, + find_index_file (misc, misc->daisy_mp, "ncc.html"), + MAX_STR - 1); + *misc->ncx_name = 0; + strncpy (misc->ncx_name, + find_index_file (misc, misc->daisy_mp, ".ncx"), + MAX_STR - 1); + *misc->opf_name = 0; + strncpy (misc->opf_name, + find_index_file (misc, misc->daisy_mp, ".opf"), + MAX_STR - 1); +} // find_index_names + +int get_page_number_2 (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy, char *attr) +{ +// function for daisy 2.02 + if (daisy[misc->playing].page_number == 0) + return 0; +#ifdef DAISY_PLAYER + char *src, *anchor; + xmlTextReaderPtr page; + htmlDocPtr doc; + + src = malloc (strlen (misc->daisy_mp) + strlen (attr) + 3); + strcpy (src, misc->daisy_mp); + strcat (src, "/"); + strcat (src, attr); + anchor = strdup (""); + if (strchr (src, '#')) + { + anchor = strdup (strchr (src, '#') + 1); + *strchr (src, '#') = 0; + } // if + doc = htmlParseFile (src, "UTF-8"); + if (! (page = xmlReaderWalker (doc))) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), src); + failure (misc, str, e); + } // if + if (*anchor) + { + do + { + if (! get_tag_or_label (misc, my_attribute, page)) + { + xmlTextReaderClose (page); + xmlFreeDoc (doc); + return 0; + } // if + } while (strcasecmp (my_attribute->id, anchor) != 0); + } // if + while (1) + { + if (! get_tag_or_label (misc, my_attribute, page)) + { + xmlTextReaderClose (page); + xmlFreeDoc (doc); + return 0; + } // if + if (*misc->label) + { + xmlTextReaderClose (page); + xmlFreeDoc (doc); + misc->current_page_number = atoi (misc->label); + return 1; + } // if + } // while +#endif + +#ifdef EBOOK_SPEAKER + while (1) + { + if (*misc->label) + { + misc->current_page_number = atoi (misc->label); + return 1; + } // if + if (! get_tag_or_label (misc, my_attribute, misc->reader)) + return 0; + } // while + attr = attr; // don't need it in eBook-speaker +#endif +} // get_page_number_2 + +int get_page_number_3 (misc_t *misc, my_attribute_t *my_attribute) +{ +// function for daisy 3 + while (1) + { + if (! get_tag_or_label (misc, my_attribute, misc->reader)) + return 0; +#ifdef DAISY_PLAYER + if (strcasecmp (misc->tag, "text") == 0) + { + char *file, *anchor; + xmlTextReaderPtr page; + htmlDocPtr doc; + + anchor = strdup (""); + if (strchr (my_attribute->src, '#')) + { + anchor = strdup (strchr (my_attribute->src, '#') + 1); + *strchr (my_attribute->src, '#') = 0; + } // if + file = real_name (misc, my_attribute->src); + doc = htmlParseFile (file, "UTF-8"); + if (! (page = xmlReaderWalker (doc))) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), file); + failure (misc, str, e); + } // if + if (*anchor) + { + do + { + if (! get_tag_or_label (misc, my_attribute, page)) + { + xmlTextReaderClose (page); + xmlFreeDoc (doc); + return 0; + } // if + } while (strcasecmp (my_attribute->id, anchor) != 0); + } // if anchor + while (1) + { + if (! get_tag_or_label (misc, my_attribute, page)) + { + xmlTextReaderClose (page); + xmlFreeDoc (doc); + return 0; + } // if + if (*misc->label) + { + xmlTextReaderClose (page); + xmlFreeDoc (doc); + misc->current_page_number = atoi (misc->label); + return 1; + } // if + } // while + } // if text +#endif + +#ifdef EBOOK_SPEAKER + if (*misc->label) + { + misc->current_page_number = atoi (misc->label); + return 1; + } // if + if (! get_tag_or_label (misc, my_attribute, misc->reader)) + return 0; +#endif + } // while +} // get_page_number_3 + +void kill_player (misc_t *misc) +{ + kill (misc->player_pid, SIGKILL); +#ifdef EBOOK_SPEAKER + unlink (misc->eBook_speaker_txt); + unlink (misc->tmp_wav); +#endif +#ifdef DAISY_PLAYER + unlink (misc->tmp_wav); +#endif +} // kill_player + +void skip_right (misc_t *misc, daisy_t *daisy) +{ +#ifdef DAISY_PLAYER + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + return; +#endif + if (misc->playing == -1) + { + beep (); + return; + } // if + misc->current = misc->displaying = misc->playing; + wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); + kill_player (misc); +} // skip_right + +#ifdef DAISY_PLAYER +daisy_t *create_daisy_struct (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +#endif +#ifdef EBOOK_SPEAKER +daisy_t *create_daisy_struct (misc_t *misc, my_attribute_t *my_attribute) +#endif +{ + htmlDocPtr doc; + xmlTextReaderPtr ptr; + + misc->total_pages = 0; + *misc->daisy_version = 0;\ + *misc->ncc_html = *misc->ncx_name = *misc->opf_name = 0; + find_index_names (misc); + +// lookfor "ncc.html" + if (*misc->ncc_html) + { + htmlDocPtr doc; + xmlTextReaderPtr ncc; + + misc->daisy_mp = strdup (misc->ncc_html); + misc->daisy_mp = dirname (misc->daisy_mp); + strncpy (misc->daisy_version, "2.02", 4); + doc = htmlParseFile (misc->ncc_html, "UTF-8"); + ncc = xmlReaderWalker (doc); + misc->total_items = 0; + while (1) + { + if (! get_tag_or_label (misc, my_attribute, ncc)) + break; + if (strcasecmp (misc->tag, "h1") == 0 || + strcasecmp (misc->tag, "h2") == 0 || + strcasecmp (misc->tag, "h3") == 0 || + strcasecmp (misc->tag, "h4") == 0 || + strcasecmp (misc->tag, "h5") == 0 || + strcasecmp (misc->tag, "h6") == 0) + { + misc->total_items++; + } // if + } // while + xmlTextReaderClose (ncc); + xmlFreeDoc (doc); + return (daisy_t *) malloc ((misc->total_items + 1) * sizeof (daisy_t)); + } // if ncc.html + +// lookfor *.ncx + if (*misc->ncx_name) + strncpy (misc->daisy_version, "3", 2); + if (strlen (misc->ncx_name) < 4) + *misc->ncx_name = 0; + +// lookfor "*.opf"" + if (*misc->opf_name) + strncpy (misc->daisy_version, "3", 2); + if (strlen (misc->opf_name) < 4) + *misc->opf_name = 0; + +// count items in opf + misc->items_in_opf = 0; + doc = htmlParseFile (misc->opf_name, "UTF-8"); + ptr = xmlReaderWalker (doc); + while (1) + { + if (! get_tag_or_label (misc, my_attribute, ptr)) + break; + if (strcasecmp (misc->tag, "itemref") == 0) + misc->items_in_opf++; + } // while + xmlTextReaderClose (ptr); + xmlFreeDoc (doc); + +// count items in ncx + misc->items_in_ncx = 0; + doc = htmlParseFile (misc->ncx_name, "UTF-8"); + ptr = xmlReaderWalker (doc); + while (1) + { + if (! get_tag_or_label (misc, my_attribute, ptr)) + break; + if (strcasecmp (misc->tag, "navpoint") == 0) + misc->items_in_ncx++; + } // while + xmlTextReaderClose (ptr); + xmlFreeDoc (doc); + + if (misc->items_in_ncx == 0 && misc->items_in_opf == 0) + { + endwin (); + printf ("%s\n", + gettext ("Please try to play this book with daisy-player")); + beep (); +#ifdef DAISY_PLAYER + quit_daisy_player (misc, daisy); +#endif +#ifdef EBOOK_SPEAKER + quit_eBook_speaker (misc); +#endif + _exit (0); + } // if + + misc->total_items = misc->items_in_ncx; + if (misc->items_in_opf > misc->items_in_ncx) + misc->total_items = misc->items_in_opf; + switch (chdir (misc->daisy_mp)) + { + default: + break; + } // switch +#ifdef EBOOK_SPEAKER + snprintf (misc->eBook_speaker_txt, MAX_STR, + "%s/eBook-speaker.txt", misc->daisy_mp); + snprintf (misc->tmp_wav, MAX_STR, + "%s/eBook-speaker.wav", misc->daisy_mp); +#endif + if (misc->total_items == 0) + misc->total_items = 1; + return (daisy_t *) malloc (misc->total_items * sizeof (daisy_t)); +} // create_daisy_struct + +void make_tmp_dir (misc_t *misc) +{ + misc->tmp_dir = strdup ("/tmp/" PACKAGE ".XXXXXX"); + if (! mkdtemp (misc->tmp_dir)) + { + int e; + + e = errno; + beep (); + failure (misc, misc->tmp_dir, e); + } // if +#ifdef EBOOK_SPEAKER + switch (chdir (misc->tmp_dir)) + { + case 01: + failure (misc, misc->tmp_dir, errno); + default: + break; + } // switch +#endif +} // make_tmp_dir + +void remove_tmp_dir (misc_t *misc) +{ + if (strncmp (misc->tmp_dir, "/tmp/", 5) == 0) + { +// Be sure not to remove wrong files +#ifdef DAISY_PLAYER + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + { + rmdir (misc->tmp_dir); + return; + } // if +#endif + + snprintf (misc->cmd, MAX_CMD - 1, "rm -rf %s", misc->tmp_dir); + if (system (misc->cmd) != 0) + { + int e; + + e = errno; + snprintf (misc->str, MAX_STR, "%s: %s\n", misc->cmd, strerror (e)); + failure (misc, misc->str, e); + } // if + } // if +} // remove_tmp_dir + +void clear_tmp_dir (misc_t *misc) +{ + if (strstr (misc->tmp_dir, "/tmp/")) + { +// Be sure not to remove wrong files + snprintf (misc->cmd, MAX_CMD - 1, "rm -rf %s/*", misc->tmp_dir); + switch (system (misc->cmd)) + { + default: + break; + } // switch + } // if +} // clear_tmp_dir + +void get_attributes (misc_t *misc, my_attribute_t *my_attribute, + xmlTextReaderPtr ptr) +{ + char attr[MAX_STR + 1]; + + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, BAD_CAST "class")); + if (strcmp (attr, "(null)")) + snprintf (my_attribute->class, MAX_STR - 1, "%s", attr); +#ifdef EBOOK_SPEAKER + if (misc->option_b == 0) + { + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute + (ptr, (xmlChar *) "break_on_eol")); + if (strcmp (attr, "(null)")) + { + misc->break_on_EOL = attr[0]; + if (misc->break_on_EOL != 'y' && misc->break_on_EOL != 'n') + misc->break_on_EOL = 'n'; + } // if + } // if + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, BAD_CAST "my_class")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->my_class, attr, MAX_STR - 1); +#endif +#ifdef DAISY_PLAYER + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, BAD_CAST "clip-begin")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->clip_begin, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, BAD_CAST "clipbegin")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->clip_begin, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, BAD_CAST "clip-end")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->clip_end, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "clipend")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->clip_end, attr, MAX_STR - 1); +#endif + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "href")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->href, attr, MAX_STR - 1); + if (xmlTextReaderGetAttribute (ptr, (const xmlChar *) "id") != NULL) + { + my_attribute->id = strdup ((char *) xmlTextReaderGetAttribute (ptr, + (const xmlChar *) "id")); +#ifdef DAISY_PLAYER + if (strcmp (my_attribute->id, misc->current_id) != 0) + misc->current_id = strdup (my_attribute->id); +#endif + } // if + if (xmlTextReaderGetAttribute (ptr, (const xmlChar *) "idref") != NULL) + { + my_attribute->idref = strdup ((char *) xmlTextReaderGetAttribute (ptr, + (const xmlChar *) "idref")); + } // if + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "item")); + if (strcmp (attr, "(null)")) + misc->current = atoi (attr); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "level")); + if (strcmp (attr, "(null)")) + misc->level = atoi ((char *) attr); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "media-type")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->media_type, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "name")); + if (strcmp (attr, "(null)")) + { + char name[MAX_STR], content[MAX_STR]; + + *name = 0; + strncpy (attr, (char *) xmlTextReaderGetAttribute + (ptr, (const xmlChar *) "name"), MAX_STR - 1); + if (strcmp (attr, "(null)")) + strncpy (name, attr, MAX_STR - 1); + *content = 0; + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "content")); + if (strcmp (attr, "(null)")) + strncpy (content, attr, MAX_STR - 1); + if (strcasestr (name, "dc:format")) + strncpy (misc->daisy_version, content, MAX_STR - 1); + if (strcasestr (name, "dc:title") && ! *misc->daisy_title) + { + strncpy (misc->daisy_title, content, MAX_STR - 1); + strncpy (misc->bookmark_title, content, MAX_STR - 1); + if (strchr (misc->bookmark_title, '/')) + *strchr (misc->bookmark_title, '/') = '-'; + } // if +/* don't use it!!! + if (strcasestr (name, "dtb:misc->depth")) + misc->depth = atoi (content); +*/ + if (strcasestr (name, "dtb:totalPageCount")) + misc->total_pages = atoi (content); +/* don't use it!!! + if (strcasestr (name, "ncc:misc->depth")) + misc->depth = atoi (content); +*/ + if (strcasestr (name, "ncc:maxPageNormal")) + misc->total_pages = atoi (content); + if (strcasestr (name, "ncc:pageNormal")) + misc->total_pages = atoi (content); + if (strcasestr (name, "ncc:page-normal")) + misc->total_pages = atoi (content); + if (strcasestr (name, "dtb:totalTime") || + strcasestr (name, "ncc:totalTime")) + { + strncpy (misc->ncc_totalTime, content, MAX_STR - 1); + if (strchr (misc->ncc_totalTime, '.')) + *strchr (misc->ncc_totalTime, '.') = 0; + } // if + } // if + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "playorder")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->playorder, attr, MAX_STR - 1); +#ifdef EBOOK_SPEAKER + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "phrase")); + if (strcmp (attr, "(null)")) + misc->phrase_nr = atoi ((char *) attr); +#endif +#ifdef DAISY_PLAYER + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "seconds")); + if (strcmp (attr, "(null)")) + { + misc->seconds = atoi (attr); + if (misc->seconds < 0) + misc->seconds = 0; + } // if +#endif + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "smilref")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->smilref, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "sound_dev")); + if (strcmp (attr, "(null)")) + strncpy (misc->sound_dev, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "ocr_language")); + if (strcmp (attr, "(null)")) + strncpy (misc->ocr_language, attr, 5); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "cd_dev")); + if (strcmp (attr, "(null)")) + strncpy (misc->cd_dev, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "cddb_flag")); + if (strcmp (attr, "(null)")) + misc->cddb_flag = (char) attr[0]; + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "speed")); + if (strcmp (attr, "(null)")) + { + misc->speed = atof (attr); + if (misc->speed <= 0.1 || misc->speed > 2) + misc->speed = 1.0; + } // if + if (xmlTextReaderGetAttribute (ptr, (const xmlChar *) "src") != NULL) + { + my_attribute->src = strdup ((char *) xmlTextReaderGetAttribute (ptr, + (const xmlChar *) "src")); + } // if + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "tts")); + if (strcmp (attr, "(null)")) + misc->tts_no = atof ((char *) attr); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "toc")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->toc, attr, MAX_STR - 1); + snprintf (attr, MAX_STR - 1, "%s", (char *) + xmlTextReaderGetAttribute (ptr, (const xmlChar *) "value")); + if (strcmp (attr, "(null)")) + strncpy (my_attribute->value, attr, MAX_STR - 1); +} // get_attributes + +int get_tag_or_label (misc_t *misc, my_attribute_t *my_attribute, + xmlTextReaderPtr reader) +{ + int type; + + *misc->tag = 0; + misc->label = strdup (""); +#ifdef EBOOK_SPEAKER + *my_attribute->my_class = 0; +#endif + *my_attribute->class = 0; +#ifdef DAISY_PLAYER + *my_attribute->clip_begin = *my_attribute->clip_end = 0; +#endif + *my_attribute->href = *my_attribute->media_type = + *my_attribute->playorder = * my_attribute->smilref = + *my_attribute->toc = *my_attribute->value = 0; + my_attribute->id = strdup (""); + my_attribute->idref = strdup (""); + my_attribute->src = strdup (""); + + if (! reader) + { + return 0; + } // if + switch (xmlTextReaderRead (reader)) + { + case -1: + { + failure (misc, "xmlTextReaderRead ()\n" + "Can't handle this DTB structure!\n" + "Don't know how to handle it yet, sorry. :-(\n", errno); + } + case 0: + { + return 0; + } + case 1: + break; + } // swwitch + type = xmlTextReaderNodeType (reader); + switch (type) + { + int n, i; + + case -1: + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read type: %d"), type); + failure (misc, str, e); + } + case XML_READER_TYPE_ELEMENT: + strncpy (misc->tag, (char *) xmlTextReaderConstName (reader), + MAX_TAG - 1); + n = xmlTextReaderAttributeCount (reader); + for (i = 0; i < n; i++) + get_attributes (misc, my_attribute, reader); +#ifdef DAISY_PLAYER + if (strcasecmp (misc->tag, "audio") == 0) + misc->audio_id = strdup (misc->current_id); +#endif + return 1; + case XML_READER_TYPE_END_ELEMENT: + snprintf (misc->tag, MAX_TAG - 1, "/%s", + (char *) xmlTextReaderName (reader)); + return 1; + case XML_READER_TYPE_TEXT: + case XML_READER_TYPE_CDATA: + case XML_READER_TYPE_SIGNIFICANT_WHITESPACE: + { + int x; + size_t phrase_len; + + phrase_len = strlen ((char *) xmlTextReaderConstValue (reader)); + x = 0; + while (1) + { + if (isspace (xmlTextReaderValue (reader)[x])) + x++; + else + break; + } // while + misc->label = realloc (misc->label, phrase_len + 1); + snprintf (misc->label, phrase_len - x + 1, "%s", (char *) + xmlTextReaderValue (reader) + x); + for (x = strlen (misc->label) - 1; x >= 0 && isspace (misc->label[x]); + x--) + misc->label[x] = 0; + for (x = 0; misc->label[x] > 0; x++) + if (! isprint (misc->label[x])) + misc->label[x] = ' '; + return 1; + } + case XML_READER_TYPE_ENTITY_REFERENCE: + snprintf (misc->tag, MAX_TAG - 1, "/%s", + (char *) xmlTextReaderName (reader)); + return 1; + default: + return 1; + } // switch + return 0; +} // get_tag_or_label + +void go_to_page_number (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ + char pn[15]; + + kill (misc->player_pid, SIGKILL); +#ifdef DAISY_PLAYER + if (misc->cd_type != CDIO_DISC_MODE_CD_DA) +#endif + misc->player_pid = -2; + misc->playing = misc->just_this_item = -1; + view_screen (misc, daisy); +#ifdef EBOOK_SPEAKER + remove (misc->tmp_wav); +#endif + unlink ("old.wav"); + mvwprintw (misc->titlewin, 1, 0, + "----------------------------------------"); + wprintw (misc->titlewin, "----------------------------------------"); + mvwprintw (misc->titlewin, 1, 0, "%s ", gettext ("Go to page number:")); + echo (); + wgetnstr (misc->titlewin, pn, 5); + noecho (); + view_screen (misc, daisy); + if (atoi (pn) == 0 || atoi (pn) > misc->total_pages) + { + beep (); + pause_resume (misc, my_attribute, daisy); + pause_resume (misc, my_attribute, daisy); + return; + } // if + +// start searching + mvwprintw (misc->titlewin, 1, 0, + "----------------------------------------"); + wprintw (misc->titlewin, "----------------------------------------"); + wattron (misc->titlewin, A_BOLD); + mvwprintw (misc->titlewin, 1, 0, "%s", gettext ("Please wait...")); + wattroff (misc->titlewin, A_BOLD); + wrefresh (misc->titlewin); + misc->playing = misc->current_page_number = 0; +#ifdef EBOOK_SPEAKER + misc->phrase_nr = 0; +#endif + +#ifdef DAISY_PLAYER + open_clips_file (misc, my_attribute, daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); +#endif +#ifdef EBOOK_SPEAKER + open_text_file (misc, my_attribute, daisy[misc->playing].xml_file, + daisy[misc->playing].anchor); +#endif + while (1) + { + if (misc->current_page_number == atoi (pn)) + { + misc->displaying = misc->current = misc->playing; + misc->player_pid = -2; + view_screen (misc, daisy); + return; + } // if (misc->current_page_number == atoi (pn)) + if (misc->current_page_number > atoi (pn)) + { + misc->current = misc->playing = 0; + misc->current_page_number = daisy[misc->playing].page_number; +#ifdef DAISY_PLAYER + open_clips_file (misc, my_attribute, daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); +#endif +#ifdef EBOOK_SPEAKER + open_text_file (misc, my_attribute, daisy[misc->playing].xml_file, + daisy[misc->playing].anchor); +#endif + return; + } // if +#ifdef DAISY_PLAYER + get_next_clips (misc, my_attribute, daisy); +#endif +#ifdef EBOOK_SPEAKER + get_next_phrase (misc, my_attribute, daisy, 0); +#endif + } // while +} // go_to_page_number + +void select_next_output_device (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ + FILE *r; + int n, y, playing; + size_t bytes; + char *list[10], *trash; + + playing= misc->playing; + if (playing > -1) + pause_resume (misc, my_attribute, daisy); + wclear (misc->screenwin); + wprintw (misc->screenwin, "\n%s\n\n", gettext ("Select a soundcard:")); + if (! (r = fopen ("/proc/asound/cards", "r"))) + failure (misc, gettext ("Cannot read /proc/asound/cards"), errno); + for (n = 0; n < 10; n++) + { + list[n] = (char *) malloc (1000); + bytes = getline (&list[n], &bytes, r); + if ((int) bytes == -1) + break; + trash = (char *) malloc (1000); + bytes = getline (&trash, &bytes, r); + free (trash); + wprintw (misc->screenwin, " %s", list[n]); + free (list[n]); + } // for + fclose (r); + y = 3; + nodelay (misc->screenwin, FALSE); + for (;;) + { + wmove (misc->screenwin, y, 2); + switch (wgetch (misc->screenwin)) + { + case 13: // + snprintf (misc->sound_dev, MAX_STR - 1, "hw:%i", y - 3); + view_screen (misc, daisy); + nodelay (misc->screenwin, TRUE); + if (playing > -1) + pause_resume (misc, my_attribute, daisy); + return; + case KEY_DOWN: + if (++y == n + 3) + y = 3; + break; + case KEY_UP: + if (--y == 2) + y = n + 2; + break; + default: + view_screen (misc, daisy); + nodelay (misc->screenwin, TRUE); + if (playing > -1) + pause_resume (misc, my_attribute, daisy); + return; + } // switch + } // for +} // select_next_output_device diff --git a/src/daisy-player.c b/src/daisy-player.c index f9f15d4..c34ace8 100644 --- a/src/daisy-player.c +++ b/src/daisy-player.c @@ -1,6 +1,6 @@ -/* daisy-player - A parser to play Daisy cd's. +/* daisy-player * - * Copyright (C)2003-2015 J. Lemmens + * Copyright (C)2003-2017 J. Lemmens * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -15,147 +15,115 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + */ -#include "src/daisy.h" - -void playfile (misc_t *misc, char *in_file, char *in_type, - char *out_file, char *out_type, char *tempo) -{ - sox_format_t *sox_in, *sox_out; - sox_effects_chain_t *chain; - sox_effect_t *e; - char *args[MAX_STR], str[MAX_STR]; - - sox_globals.verbosity = 0; - sox_globals.stdout_in_use_by = NULL; - sox_init (); - if ((sox_in = sox_open_read (in_file, NULL, NULL, in_type)) == NULL) - failure (in_file, errno); - if ((sox_out = sox_open_write (out_file, &sox_in->signal, - NULL, out_type, NULL, NULL)) == NULL) - { -// if cannot write to out_file (pulseaudio?), try ALSA default - if ((sox_out = sox_open_write ("default", &sox_in->signal, - NULL, "alsa", NULL, NULL)) == NULL) - { - int e; - - e = errno; - beep (); - endwin (); - printf ("\n%s: %s\n\n", out_file, strerror (e)); - fflush (stdout); - put_bookmark (misc); - strncpy (misc->sound_dev, "hw:0", MAX_STR - 1); - save_rc (misc); - kill (misc->daisy_player_pid, SIGTERM); - } // if - } // if - if (strcmp (in_type, "cdda") == 0) - { - sox_in->encoding.encoding = SOX_ENCODING_SIGN2; - sox_in->encoding.bits_per_sample = 16; - sox_in->encoding.reverse_bytes = sox_option_no; - } // if - - chain = sox_create_effects_chain (&sox_in->encoding, &sox_out->encoding); - - e = sox_create_effect (sox_find_effect ("input")); - args[0] = (char *) sox_in, sox_effect_options (e, 1, args); - sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); - -/* Don't use the sox trim effect. It works nice, but is far too slow - char str2[MAX_STR]; - snprintf (str, MAX_STR - 1, "%f", misc->clip_begin); - snprintf (str2, MAX_STR - 1, "%f", misc->clip_end - misc->clip_begin); - e = sox_create_effect (sox_find_effect ("trim")); - args[0] = str; - args[1] = str2; - sox_effect_options (e, 2, args); - sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); -*/ - - e = sox_create_effect (sox_find_effect ("tempo")); - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - args[0] = "-m"; - else - args[0] = "-s"; - args[1] = tempo; - sox_effect_options (e, 2, args); - sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); - - snprintf (str, MAX_STR - 1, "%lf", sox_out->signal.rate); - e = sox_create_effect (sox_find_effect ("rate")); - args[0] = str, sox_effect_options (e, 1, args); - sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); - - snprintf (str, MAX_STR - 1, "%i", sox_out->signal.channels); - e = sox_create_effect (sox_find_effect ("channels")); - args[0] = str, sox_effect_options (e, 1, args); - sox_add_effect (chain, e, &sox_in->signal, &sox_in->signal); - - e = sox_create_effect (sox_find_effect ("output")); - args[0] = (char *) sox_out, sox_effect_options (e, 1, args); - sox_add_effect (chain, e, &sox_in->signal, &sox_out->signal); - - sox_flow_effects (chain, NULL, NULL); - sox_delete_effects_chain (chain); - sox_close (sox_out); - sox_close (sox_in); - sox_quit (); -} // playfile +#include "daisy.h" void put_bookmark (misc_t *misc) { - char str[MAX_STR]; xmlTextWriterPtr writer; struct passwd *pw;; pw = getpwuid (geteuid ()); - snprintf (str, MAX_STR - 1, "%s/.daisy-player", pw->pw_dir); - mkdir (str, 0755); - snprintf (str, MAX_STR - 1, "%s/.daisy-player/%s%s", + snprintf (misc->str, MAX_STR - 1, "%s/.daisy-player", pw->pw_dir); + mkdir (misc->str, 0755); + snprintf (misc->str, MAX_STR - 1, "%s/.daisy-player/%s%s", pw->pw_dir, misc->bookmark_title, get_mcn (misc)); - if (! (writer = xmlNewTextWriterFilename (str, 0))) + if (! (writer = xmlNewTextWriterFilename (misc->str, 0))) return; xmlTextWriterStartDocument (writer, NULL, NULL, NULL); xmlTextWriterStartElement (writer, BAD_CAST "bookmark"); if (misc->playing >= 0) - xmlTextWriterWriteFormatAttribute + xmlTextWriterWriteFormatAttribute (writer, BAD_CAST "item", "%d", misc->playing); else xmlTextWriterWriteFormatAttribute (writer, BAD_CAST "item", "%d", misc->current); if (misc->cd_type != CDIO_DISC_MODE_CD_DA) + { xmlTextWriterWriteFormatAttribute - (writer, BAD_CAST "clip-begin", "%f", misc->clip_begin); + (writer, BAD_CAST "id", "%s", misc->current_id); + } else xmlTextWriterWriteFormatAttribute - (writer, BAD_CAST "seconds", "%d", (int) (time (NULL) - misc->elapsed_seconds)); - xmlTextWriterWriteFormatAttribute (writer, BAD_CAST "level", "%d", misc->level); + (writer, BAD_CAST "seconds", "%d", + (int) (time (NULL) - misc->elapsed_seconds)); + xmlTextWriterWriteFormatAttribute (writer, BAD_CAST + "level", "%d", misc->level); xmlTextWriterEndElement (writer); xmlTextWriterEndDocument (writer); xmlFreeTextWriter (writer); } // put_bookmark +void get_clips (misc_t *misc, my_attribute_t *my_attribute) +{ + char begin_str[MAX_STR], *begin, *orig_begin, *end; + + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + return; + orig_begin = my_attribute->clip_begin; + end = my_attribute->clip_end; + if (! *orig_begin) + return; + strncpy (begin_str, orig_begin, MAX_STR - 1); + begin = begin_str; + while (! isdigit (*begin)) + begin++; + if (strchr (begin, 's')) + *strchr (begin, 's') = 0; + if (! strchr (begin, ':')) + misc->clip_begin = (float) atof (begin); + else + misc->clip_begin = read_time (begin); + +// fill end + while (! isdigit (*end)) + end++; + if (strchr (end, 's')) + *strchr (end, 's') = 0; + if (! strchr (end, ':')) + misc->clip_end = (float) atof (end); + else + misc->clip_end = read_time (end); +} // get_clips + +float read_time (char *p) +{ + char *h, *m, *s; + + s = strrchr (p, ':') + 1; + if (s > p) + *(s - 1) = 0; + if (strchr (p, ':')) + { + m = strrchr (p, ':') + 1; + *(m - 1) = 0; + h = p; + } + else + { + h = "0"; + m = p; + } // if + return atoi (h) * 3600 + atoi (m) * 60 + (float) atof (s); +} // read_time + void get_bookmark (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - char str[MAX_STR]; - float begin; xmlTextReaderPtr local_reader; - xmlDocPtr local_doc; + htmlDocPtr local_doc; struct passwd *pw; + char *id; if (misc->ignore_bookmark == 1) return; pw = getpwuid (geteuid ()); if (! *misc->bookmark_title) return; - snprintf (str, MAX_STR - 1, "%s/.daisy-player/%s%s", + snprintf (misc->str, MAX_STR - 1, "%s/.daisy-player/%s%s", pw->pw_dir, misc->bookmark_title, get_mcn (misc)); - local_doc = xmlRecoverFile (str); + local_doc = htmlParseFile (misc->str, "UTF-8"); if (! (local_reader = xmlReaderWalker (local_doc))) { xmlFreeDoc (local_doc); @@ -168,8 +136,11 @@ void get_bookmark (misc_t *misc, my_attribute_t *my_attribute, } while (strcasecmp (misc->tag, "bookmark") != 0); xmlTextReaderClose (local_reader); xmlFreeDoc (local_doc); - if (misc->current <= 0) + if (misc->current < 0) + { misc->current = 0; + return; + } // if if (misc->current >= misc->total_items) misc->current = 0; misc->displaying = misc->playing = misc->current; @@ -180,194 +151,98 @@ void get_bookmark (misc_t *misc, my_attribute_t *my_attribute, misc->elapsed_seconds = time (NULL) - misc->elapsed_seconds; return; } // if - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - begin = misc->clip_begin; - open_smil_file (misc, my_attribute, daisy[misc->current].smil_file, - daisy[misc->current].anchor); + id = my_attribute->id; + open_clips_file (misc, my_attribute, daisy[misc->current].clips_file, + daisy[misc->current].clips_anchor); while (1) { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - break; - if (strcasecmp (misc->tag, "audio") == 0) + if (strcmp (misc->current_id, id) == 0) { - strncpy (misc->current_audio_file, my_attribute->src, MAX_STR - 1); - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - if (misc->clip_begin == begin) - break; + start_playing (misc, daisy); + break; } // if + get_next_clips (misc, my_attribute, daisy); } // while - if (misc->level < 1) + if (misc->level < 1) misc->level = 1; - misc->current_page_number = daisy[misc->playing].page_number; + misc->current_page_number = daisy[misc->playing].page_number - 1; misc->just_this_item = -1; - skip_left (misc, my_attribute, daisy); - skip_right (misc); + pause_resume (misc, my_attribute, daisy); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); - return; } // get_bookmark -void get_page_number_2 (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy, char *p) +void get_next_clips (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) { -// function for daisy 2.02 - char *anchor = 0, *id1, *id2; - xmlTextReaderPtr page; - xmlDocPtr doc; - - doc = xmlRecoverFile (daisy[misc->playing].smil_file); - if (! (page = xmlReaderWalker (doc))) - { - int e; - char str[MAX_STR]; - - e = errno; - snprintf (str, MAX_STR, - gettext ("Cannot read %s"), daisy[misc->playing].smil_file); - failure (str, e); - } // if - id1 = strdup (p); - do - { - if (! get_tag_or_label (misc, my_attribute, page)) - { - free (id1); - return; - } // if - } while (strcasecmp (my_attribute->id, id1) != 0); - do - { - if (! get_tag_or_label (misc, my_attribute, page)) - return; - } while (strcasecmp (misc->tag, "text") != 0); - id2 = strdup (my_attribute->id); - xmlTextReaderClose (page); - xmlFreeDoc (doc); - doc = xmlRecoverFile (misc->NCC_HTML); - if (! (page = xmlReaderWalker (doc))) - { - int e; - char str[MAX_STR]; + int eof; - e = errno; - snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->NCC_HTML); - failure (str, e); - } // if while (1) { - if (! get_tag_or_label (misc, my_attribute, page)) - return; - if (strcasecmp (misc->tag, "a") == 0) + eof = 1 - get_tag_or_label (misc, my_attribute, misc->reader); + if (strcasecmp (misc->tag, "audio") == 0) { - if (strchr (my_attribute->href, '#')) - anchor = strdup (strchr (my_attribute->href, '#') + 1); - if (strcasecmp (anchor, id2) == 0) - break; - } // if - } // while - do - { - if (! get_tag_or_label (misc, my_attribute, page)) + misc->current_audio_file = real_name (misc, my_attribute->src); + get_clips (misc, my_attribute); return; - } while (! *misc->label); - xmlTextReaderClose (page); - xmlFreeDoc (doc); - misc->current_page_number = atoi (misc->label); -} // get_page_number_2 - -int get_next_clips (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) -{ - while (1) - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return 0; - if (strcasecmp (my_attribute->id, - daisy[misc->playing + 1].anchor) == 0 && - misc->playing + 1 != misc->total_items) - return 0; - if (strcasecmp (my_attribute->class, "pagenum") == 0) - if (strcasestr (misc->daisy_version, "3")) - get_page_number_3 (misc, my_attribute); - if (strcasecmp (misc->tag, "audio") == 0) + } // if + if (strcasestr (misc->daisy_version, "2.02") && + strcasecmp (misc->tag, "text") == 0) { - strncpy (misc->current_audio_file, my_attribute->src, MAX_STR - 1); - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - return 1; - } // if (strcasecmp (misc->tag, "audio") == 0) - } // while -} // get_next_clips - -int compare_playorder (const void *p1, const void *p2) -{ - return (*(int *)p1 - *(int*)p2); -} // compare_playorder - -void parse_smil_2 (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) -{ -// function for daisy 2.02 - int x; - xmlTextReaderPtr parse; - - misc->total_time = 0; - for (x = 0; x < misc->total_items; x++) - { - if (*daisy[x].smil_file == 0) - continue; - xmlDocPtr doc = xmlRecoverFile (daisy[x].smil_file); - if (! (parse = xmlReaderWalker (doc))) + if (get_page_number_2 (misc, my_attribute, daisy, my_attribute->src)) + return; + } // if + if (strcasestr (misc->daisy_version, "3") && + (strcasecmp (misc->tag, "pagenum") == 0 || + strcasecmp (my_attribute->class, "pagenum") == 0)) { - int e; - char str[MAX_STR]; - - e = errno; - snprintf (str, MAX_STR, - gettext ("Cannot read %s"), daisy[x].smil_file); - failure (str, e); + if (get_page_number_3 (misc, my_attribute)) + return; } // if -// parse this smil - do + if ((misc->playing + 1 < misc->total_items && + strcasecmp (my_attribute->id, + daisy[misc->playing + 1].clips_anchor) == 0) || + eof) { - if (! get_tag_or_label (misc, my_attribute, parse)) - break; - } while (strcasecmp (my_attribute->id, daisy[x].anchor) != 0); - daisy[x].duration = 0; - while (1) - { - if (! get_tag_or_label (misc, my_attribute, parse)) - break; - if (strcasecmp (misc->tag, "audio") == 0) + if (*daisy[misc->playing + 1].clips_anchor || eof) { - strncpy (misc->current_audio_file, my_attribute->src, MAX_STR - 1); - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - daisy[x].begin = misc->clip_begin; - daisy[x].duration += misc->clip_end - misc->clip_begin; - while (1) +// go to next item + strncpy (my_attribute->clip_begin, "0", 2); + misc->clip_begin = 0; + if (++misc->playing >= misc->total_items) { - if (! get_tag_or_label (misc, my_attribute, parse)) - break; - if (*daisy[x + 1].anchor) - if (strcasecmp (my_attribute->id, daisy[x + 1].anchor) == 0) - break; - if (strcasecmp (misc->tag, "audio") == 0) + struct passwd *pw; + + pw = getpwuid (geteuid ()); + quit_daisy_player (misc, daisy); + snprintf (misc->str, MAX_STR - 1, "%s/.daisy-player/%s%s", + pw->pw_dir, misc->bookmark_title, get_mcn (misc)); + unlink (misc->str); + _exit (0); + } // if + if (daisy[misc->playing].level <= misc->level) + misc->displaying = misc->current = misc->playing; + if (misc->just_this_item != -1) + { + if (daisy[misc->playing].level <= misc->level) { - get_clips (misc, my_attribute->clip_begin, - my_attribute->clip_end); - daisy[x].duration += misc->clip_end - misc->clip_begin; - } // if (strcasecmp (misc->tag, "audio") == 0) - } // while - if (*daisy[x + 1].anchor) - if (strcasecmp (my_attribute->id, daisy[x + 1].anchor) == 0) + misc->playing = misc->just_this_item = -1; break; - } // if (strcasecmp (misc->tag, "audio") == 0) - } // while - xmlTextReaderClose (parse); - xmlFreeDoc (doc); - misc->total_time += daisy[x].duration; - } // for -} // parse_smil_2 + } // if + } // if + if (misc->playing > -1) + { + open_clips_file (misc, my_attribute, + daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); + } // if + } // if + } // if + } // while +} // get_next_clips -void view_page (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) +void view_page (misc_t *misc, daisy_t *daisy) { if (misc->playing == -1) return; @@ -376,13 +251,9 @@ void view_page (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) if (misc->total_pages == 0) return; wattron (misc->screenwin, A_BOLD); - if (strcasestr (misc->daisy_version, "2.02")) - get_page_number_2 (misc, my_attribute, daisy, my_attribute->id); if (misc->current_page_number) mvwprintw (misc->screenwin, daisy[misc->playing].y, 62, "(%3d)", misc->current_page_number); - else - mvwprintw (misc->screenwin, daisy[misc->playing].y, 62, " "); wattroff (misc->screenwin, A_BOLD); wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); wrefresh (misc->screenwin); @@ -406,7 +277,8 @@ void view_time (misc_t *misc, daisy_t *daisy) { struct stat buf; - stat (misc->tmp_wav, &buf); + if (stat (misc->tmp_wav, &buf)) + return; elapsed_seconds = (misc->clip_begin - daisy[misc->playing].begin) + (time (NULL) - buf.st_atime); remain_seconds = daisy[misc->playing].duration - elapsed_seconds; @@ -421,7 +293,7 @@ void view_time (misc_t *misc, daisy_t *daisy) wattroff (misc->screenwin, A_BOLD); wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); wrefresh (misc->screenwin); -} // view_time +} // view_time void view_screen (misc_t *misc, daisy_t *daisy) { @@ -433,15 +305,24 @@ void view_screen (misc_t *misc, daisy_t *daisy) wprintw (misc->titlewin, "----------------------------------------"); mvwprintw (misc->titlewin, 1, 0, gettext ("'h' for help -")); if (misc->total_pages) - wprintw (misc->titlewin, gettext (" %d pages "), misc->total_pages); - mvwprintw (misc->titlewin, 1, 28, gettext (" level: %d of %d "), - misc->level, misc->depth); + { + wprintw (misc->titlewin, " "); + wprintw (misc->titlewin, gettext ("%d pages"), + misc->total_pages); + wprintw (misc->titlewin, " "); + } // if + mvwprintw (misc->titlewin, 1, 29, " "); + wprintw (misc->titlewin, gettext ("level: %d of %d"), + misc->level, misc->depth); + wprintw (misc->titlewin, " "); time = misc->total_time / misc->speed; int hours = time / 3600; int minutes = (time - hours * 3600) / 60; int seconds = time - (hours * 3600 + minutes * 60); - mvwprintw (misc->titlewin, 1, 47, gettext (" total length: %02d:%02d:%02d "), + mvwprintw (misc->titlewin, 1, 47, " "); + wprintw (misc->titlewin, gettext ("total length: %02d:%02d:%02d"), hours, minutes,seconds); + wprintw (misc->titlewin, " "); mvwprintw (misc->titlewin, 1, 74, " %d/%d ", daisy[misc->current].screen + 1, daisy[misc->total_items - 1].screen + 1); @@ -458,7 +339,8 @@ void view_screen (misc_t *misc, daisy_t *daisy) for (x2 = x; x2 < 59; x2 = x2 + 2) wprintw (misc->screenwin, " ."); if (daisy[i].page_number) - mvwprintw (misc->screenwin, daisy[i].y, 61, " (%3d)", daisy[i].page_number); + mvwprintw (misc->screenwin, daisy[i].y, 61, " (%3d)", + daisy[i].page_number); if (daisy[i].level <= misc->level) { int x, dur = 0; @@ -474,227 +356,113 @@ void view_screen (misc_t *misc, daisy_t *daisy) mvwprintw (misc->screenwin, daisy[i].y, 74, "%02d:%02d", (int) (dur + .5) / 60, (int) (dur + .5) % 60); } // if - if (i >= misc->total_items) + if (i >= misc->total_items - 1) break; - } while (daisy[++i].screen == daisy[misc->current].screen); + i++; + } while (daisy[i].screen == daisy[misc->current].screen); if (misc->just_this_item != -1 && daisy[misc->current].screen == daisy[misc->playing].screen) mvwprintw (misc->screenwin, daisy[misc->displaying].y, 0, "J"); wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); wrefresh (misc->screenwin); + view_page (misc, daisy); + view_time (misc, daisy); } // view_screen -void read_daisy_2 (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) -{ -// function for daisy 2.02 - int indent = 0, found_page_normal = 0; - xmlTextReaderPtr ncc; - xmlDocPtr doc = NULL; - - if ((doc = xmlRecoverFile (misc->NCC_HTML)) == NULL) - failure ("read_daisy_2 ()", errno); - if (! (ncc = xmlReaderWalker (doc))) - { - char str[MAX_STR]; - int e; - - e = errno; - snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->NCC_HTML); - failure (str, e); - } // if - - misc->current = misc->displaying = 0; - while (1) - { - if (! get_tag_or_label (misc, my_attribute, ncc)) - break; - if (strcasecmp (misc->tag, "h1") == 0 || - strcasecmp (misc->tag, "h2") == 0 || - strcasecmp (misc->tag, "h3") == 0 || - strcasecmp (misc->tag, "h4") == 0 || - strcasecmp (misc->tag, "h5") == 0 || - strcasecmp (misc->tag, "h6") == 0) - { - int l; - - found_page_normal = 0; - daisy[misc->current].page_number = 0; - l = misc->tag[1] - '0'; - daisy[misc->current].level = l; - daisy[misc->current].x = l + 3 - 1; - indent = daisy[misc->current].x = (l - 1) * 3 + 1; - do - { - if (! get_tag_or_label (misc, my_attribute, ncc)) - break; - } while (strcasecmp (misc->tag, "a") != 0); - strncpy (daisy[misc->current].smil_file, my_attribute->href, - MAX_STR - 1); - - if (strchr (daisy[misc->current].smil_file, '#')) - { - strncpy (daisy[misc->current].anchor, - strchr (daisy[misc->current].smil_file, '#') + 1, MAX_STR - 1); - *strchr (daisy[misc->current].smil_file, '#') = 0; - } // if - do - { - if (! get_tag_or_label (misc, my_attribute, ncc)) - break; - } while (*misc->label == 0); - get_label (misc, daisy, indent); - misc->current++; - misc->displaying++; - } // if (strcasecmp (misc->tag, "h1") == 0 || ... - if (strcasecmp (my_attribute->class, "page-normal") == 0 && - found_page_normal == 0) - { - found_page_normal = 1; - do - { - if (! get_tag_or_label (misc, my_attribute, ncc)) - break; - } while (*misc->label == 0); - daisy[misc->current - 1].page_number = atoi (misc->label); - } // if (strcasecmp (my_attribute->class, "page-normal") - } // while - xmlTextReaderClose (ncc); - xmlFreeDoc (doc); - misc->total_items = misc->current; - parse_smil_2 (misc, my_attribute, daisy); -} // read_daisy_2 - -void player_ended () -{ - wait (NULL); -} // player_ended - -void play_now (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) +void start_playing (misc_t *misc, daisy_t *daisy) { + if (strcasecmp (misc->tag, "audio") != 0) + return; if (misc->playing == -1) return; if (misc->clip_end - misc->clip_begin <= 0) return; - misc->elapsed_seconds = time (NULL); switch (misc->player_pid = fork ()) { case -1: - failure ("fork ()", errno); + failure (misc, "fork ()", errno); case 0: // child break; default: // parent return; } // switch - char tempo_str[15], cmd[MAX_CMD]; - int err; + char tempo_str[15]; - setsid (); - - view_page (misc, my_attribute, daisy); + view_page (misc, daisy); lseek (misc->tmp_wav_fd, SEEK_SET, 0); - snprintf (cmd, MAX_CMD - 1, "madplay -Q %s -s %f -t %f -o wav:\"%s\"", - misc->current_audio_file, misc->clip_begin, - misc->clip_end - misc->clip_begin, misc->tmp_wav); - if ((err = system (cmd)) != 0) + snprintf (misc->cmd, MAX_CMD - 1, + "/usr/bin/madplay -Q \"%s\" -s %f -t %f -o wav:\"%s\"", + misc->current_audio_file, misc->clip_begin, + misc->clip_end - misc->clip_begin, misc->tmp_wav); + if (system (misc->cmd) != 0) { - endwin (); + int e; + + e = errno; beep (); - printf ("\n%s: %s\n", cmd, strerror (err)); - printf ("Is madplay installed?"); - kill (misc->daisy_player_pid, SIGTERM); + endwin (); + printf ("\n"); + kill (getppid (), SIGTERM); + failure (misc, misc->cmd, e); } // if snprintf (tempo_str, 10, "%lf", misc->speed); playfile (misc, misc->tmp_wav, "wav", misc->sound_dev, "alsa", tempo_str); _exit (0); -} // play_now +} // start_playing -void open_smil_file (misc_t *misc, my_attribute_t *my_attribute, - char *smil_file, char *anchor) +void open_clips_file (misc_t *misc, my_attribute_t *my_attribute, + char *clips_file, char *anchor) { - xmlDocPtr local_doc; - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) return; - if (*smil_file == 0) - return; - local_doc = xmlRecoverFile (smil_file); - if (! (misc->reader = xmlReaderWalker (local_doc))) + if (! (misc->doc = htmlParseFile (clips_file, "UTF-8"))) { int e; char str[MAX_STR]; e = errno; - snprintf (str, MAX_STR, "open_smil_file(): %s\n", smil_file); - failure (str, e); + snprintf (str, MAX_STR, "htmlParseFile (%s)", clips_file); + failure (misc, str, e); } // if - -// skip to anchor - while (1) + if (! (misc->reader = xmlReaderWalker (misc->doc))) { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - break;; - if (strcasecmp (my_attribute->id, anchor) == 0) - break; - } // while - return; -} // open_smil_file + int e; + char str[MAX_STR]; -void pause_resume (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) -{ - if (misc->playing > -1) - { - misc->pause_resume_playing = misc->playing; - misc->pause_resume_clip_begin = misc->clip_begin; - misc->pause_resume_lsn_cursor = misc->lsn_cursor; - misc->playing = -1; - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - kill (misc->player_pid, SIGKILL); - else - { - kill (misc->player_pid, SIGKILL); - misc->player_pid = -2; - } // if - return; + e = errno; + snprintf (str, MAX_STR, "open_clips_file(): %s", clips_file); + failure (misc, str, e); } // if - misc->playing = misc->pause_resume_playing; - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - { - misc->player_pid = play_track (misc, misc->sound_dev, "alsa", - misc->pause_resume_lsn_cursor - 75 * 4); + + if (*anchor == 0) return; - } // if - open_smil_file (misc, my_attribute, daisy[misc->playing].smil_file, - daisy[misc->playing].anchor); + +// skip to anchor while (1) { if (! get_tag_or_label (misc, my_attribute, misc->reader)) + break;; + if (strcasecmp (my_attribute->id, anchor) == 0) break; - if (strcasecmp (misc->tag, "audio") == 0) - { - strncpy (misc->current_audio_file, my_attribute->src, MAX_STR - 1); - get_clips (misc, my_attribute->clip_begin, - my_attribute->clip_end); - if (misc->clip_begin == misc->pause_resume_clip_begin) - break; - } // if } // while - skip_left (misc, my_attribute, daisy); - skip_right (misc); -} // pause_resume +} // open_clips_file -void write_wav (misc_t *misc, daisy_t *daisy, char *outfile) +void write_wav (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy, char *outfile) { - char str[MAX_STR]; + char str_wav[MAX_STR]; struct passwd *pw; + int old_playing, old_displaying, old_current, old_just_this_item; pw = getpwuid (geteuid ()); - snprintf (str, MAX_STR - 1, "%s/%s", pw->pw_dir, outfile); - while (access (str, F_OK) == 0) - strncat (str, ".wav", MAX_STR - 1); + strcpy (str_wav, pw->pw_dir); + strcat (str_wav, "/"); + strcat (str_wav, outfile); + strcat (str_wav, ".wav"); + while (access (str_wav, R_OK) == 0) + strncat (str_wav, ".wav", MAX_STR - 1); if (misc->cd_type == CDIO_DISC_MODE_CD_DA) { @@ -704,7 +472,7 @@ void write_wav (misc_t *misc, daisy_t *daisy, char *outfile) sp = misc->speed; misc->speed = 1; - pid = play_track (misc, str, "wav", + pid = play_track (misc, str_wav, "wav", daisy[misc->current].first_lsn); misc->speed = sp; do @@ -721,43 +489,108 @@ void write_wav (misc_t *misc, daisy_t *daisy, char *outfile) return; } // if - char cmd[MAX_CMD]; + old_playing = misc->playing; + old_displaying = misc->displaying; + old_current = misc->current; + old_just_this_item = misc->just_this_item; + misc->just_this_item = misc->playing = misc->current; + + open_clips_file (misc, my_attribute, daisy[misc->current].clips_file, + daisy[misc->current].clips_anchor); + get_next_clips (misc, my_attribute, daisy); + snprintf (misc->cmd, MAX_CMD - 1, + "/usr/bin/madplay -Q \"%s\" -s %f -t %f -o wave:\"%s\"", + misc->current_audio_file, + daisy[misc->current].begin, daisy[misc->current].duration, + str_wav); + if (system (misc->cmd) != 0) + { + int e; - lseek (misc->tmp_wav_fd, SEEK_SET, 0); - snprintf (cmd, MAX_CMD, "madplay -Q \"%s\" -s %f -t %f -o wav:\"%s\"", - misc->current_audio_file, - daisy[misc->current].begin, daisy[misc->current].duration, str); - if (system (cmd) != 0) - failure (cmd, errno); + e = errno; + beep (); + endwin (); + printf ("\n"); + failure (misc, misc->cmd, e); + } // if + misc->playing = old_playing; + misc->displaying = old_displaying; + misc->current= old_current; + misc->just_this_item = old_just_this_item; + wmove (misc->screenwin, daisy[misc->playing].y, daisy[misc->playing].x); } // write_wav -void store_to_disk (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) +void pause_resume (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - char str[MAX_STR]; - int i, pause_flag; + if (misc->playing > -1) + { + misc->pause_resume_playing = misc->playing; + misc->pause_resume_id = misc->current_id; + misc->playing = -1; + misc->pause_resume_lsn_cursor = misc->lsn_cursor; + kill (misc->player_pid, SIGKILL); + if (misc->cd_type != CDIO_DISC_MODE_CD_DA) + misc->player_pid = -2; + return; + } // if + + misc->playing = misc->pause_resume_playing; + misc->lsn_cursor = misc->pause_resume_lsn_cursor; + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + { + misc->player_pid = play_track (misc, misc->sound_dev, "alsa", + misc->pause_resume_lsn_cursor - 75 * 4); + return; + } // if + if (misc->playing < 0) + return; + open_clips_file (misc, my_attribute, daisy[misc->playing].clips_file, + daisy[misc->playing].clips_anchor); + while (1) + { + get_next_clips (misc, my_attribute, daisy); + if (strcmp (misc->pause_resume_id, misc->current_id) == 0) + { + start_playing (misc, daisy); + view_screen (misc, daisy); + return; + } // if + } // while +} // pause_resume - pause_flag = misc->playing; - if (pause_flag > -1) +void store_to_disk (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ + char *str; + int i, current, playing; + + playing =misc->playing; + if (playing > -1) pause_resume (misc, my_attribute, daisy); wclear (misc->screenwin); - snprintf (str, MAX_STR - 1, "%s.wav", daisy[misc->current].label); + current = misc->current; + str = malloc (strlen (daisy[current].label) + 10); + snprintf (str, MAX_STR - 1, "%s", daisy[misc->current].label); wprintw (misc->screenwin, - "\nStoring \"%s\" as \"%s\" into your home-folder...", - daisy[misc->current].label, str); + "\nStoring \"%s\" as \"%s.wav\" into your home-folder...", + daisy[current].label, str); wrefresh (misc->screenwin); for (i = 0; str[i] != 0; i++) if (str[i] == '/') str[i] = '-'; - write_wav (misc, daisy, str); - if (pause_flag > -1) + write_wav (misc, my_attribute, daisy, str); + if (playing > -1) pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); } // store_to_disk -void help (misc_t *misc, daisy_t *daisy) +void help (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - int y, x; + int y, x, playing; + playing = misc->playing; + if (playing > -1) + pause_resume (misc, my_attribute, daisy); getyx (misc->screenwin, y, x); wclear (misc->screenwin); wprintw (misc->screenwin, "\n%s\n", gettext @@ -792,11 +625,11 @@ void help (misc_t *misc, daisy_t *daisy) ("/ - search for a label")); wprintw (misc->screenwin, "%s\n", gettext ("d - store current item to disk")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("D,- - decrease playing speed")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("e,. - quit daisy-player, place a bookmark and eject")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("f - find the currently playing item and place the cursor there")); if (misc->cd_type == CDIO_DISC_MODE_CD_DA) wprintw (misc->screenwin, "%s\n", gettext @@ -807,35 +640,41 @@ void help (misc_t *misc, daisy_t *daisy) if (misc->total_pages) wprintw (misc->screenwin, "%s\n", gettext ("G - go to page number")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("h,? - give this help")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("j,5 - just play current item")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("l - switch to next level")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("L - switch to previous level")); wprintw (misc->screenwin, "%s\n", gettext ("n - search forwards")); wprintw (misc->screenwin, "%s\n", gettext ("N - search backwards")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("o - select next output sound device")); wprintw (misc->screenwin, "%s\n", gettext ("p - place a bookmark")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("q - quit daisy-player and place a bookmark")); - wprintw (misc->screenwin, "%s\n", gettext + wprintw (misc->screenwin, "%s\n", gettext ("s - stop playing")); wprintw (misc->screenwin, "%s\n", gettext ("U,+ - increase playing speed")); - wprintw (misc->screenwin, "\n%s", gettext + wprintw (misc->screenwin, "%s\n", gettext + ("v,1 - decrease playback volume")); + wprintw (misc->screenwin, "%s\n", gettext + ("V,7 - increase playback volume (beware of Clipping)")); + wprintw (misc->screenwin, "\n%s", gettext ("Press any key to leave help...")); nodelay (misc->screenwin, FALSE); wgetch (misc->screenwin); nodelay (misc->screenwin, TRUE); view_screen (misc, daisy); wmove (misc->screenwin, y, x); + if (playing > -1) + pause_resume (misc, my_attribute, daisy); } // help void previous_item (misc_t *misc, daisy_t *daisy) @@ -870,184 +709,96 @@ void next_item (misc_t *misc, daisy_t *daisy) wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); } // next_item -void play_clip (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) +void calculate_times_3 (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) { - char str[MAX_STR]; - - if (kill (misc->player_pid, 0) == 0) -// if still playing - return; - misc->player_pid = -2; - if (get_next_clips (misc, my_attribute, daisy)) - { - play_now (misc, my_attribute, daisy); - return; - } // if + int x; + xmlTextReaderPtr parse; + htmlDocPtr doc; -// go to next item - strncpy (my_attribute->clip_begin, "0", 2); - misc->clip_begin = 0; - if (++misc->playing >= misc->total_items) + misc->total_time = 0; + for (x = 0; x < misc->total_items; x++) { - struct passwd *pw; - - pw = getpwuid (geteuid ()); - quit_daisy_player (misc); - snprintf (str, MAX_STR - 1, "%s/.daisy-player/%s%s", pw->pw_dir, - misc->bookmark_title, get_mcn (misc)); - unlink (str); - _exit (0); - } // if - if (daisy[misc->playing].level <= misc->level) - misc->displaying = misc->current = misc->playing; - if (misc->just_this_item != -1) - if (daisy[misc->playing].level <= misc->level) - misc->playing = misc->just_this_item = -1; - if (misc->playing > -1) - open_smil_file (misc, my_attribute, daisy[misc->playing].smil_file, - daisy[misc->playing].anchor); - view_screen (misc, daisy); -} // play_clip + daisy[x].duration = 0; + if (! *daisy[x].clips_file) + continue; + doc = htmlParseFile (daisy[x].clips_file, "UTF-8"); + if (! (parse = xmlReaderWalker (doc))) + { + endwin (); + beep (); + printf ("\n"); + printf (gettext ("Cannot read %s"), daisy[x].clips_file); + printf ("\n"); + fflush (stdout); + _exit (1); + } // if -void skip_left (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) -{ - struct - { - char src[MAX_STR], clip_begin[MAX_STR], clip_end[MAX_STR]; - } curr, prev, orig; +// parse this smil + if (*daisy[x].clips_anchor) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, parse)) + break; + if (strcasecmp (daisy[x].clips_anchor, my_attribute->id) == 0) + break; + } // while + } // if - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - return; - if (misc->playing < 0) - return; - if (misc->player_pid > 0) - while (kill (misc->player_pid, SIGKILL) != 0); - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - if (daisy[misc->playing].begin != misc->clip_begin) - { -// save current values in orig and curr arrays - strncpy (orig.clip_begin, my_attribute->clip_begin, MAX_STR - 1); - strncpy (orig.clip_end, my_attribute->clip_end, MAX_STR - 1); - strncpy (orig.src, my_attribute->src, MAX_STR - 1); - strncpy (curr.clip_begin, my_attribute->clip_begin, MAX_STR - 1); - strncpy (curr.clip_end, my_attribute->clip_end, MAX_STR - 1); - strncpy (curr.src, my_attribute->src, MAX_STR - 1); - open_smil_file (misc, my_attribute, daisy[misc->playing].smil_file, - daisy[misc->playing].anchor); while (1) { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - if (strcasecmp (my_attribute->class, "pagenum") == 0) - { - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - } while (strcasecmp (misc->tag, "/par") != 0); - } // if (strcasecmp (my_attribute->class, "pagenum") == 0) + if (! get_tag_or_label (misc, my_attribute, parse)) + break; +// get misc->clip_begin if (strcasecmp (misc->tag, "audio") == 0) - { - strncpy (prev.clip_begin, curr.clip_begin, MAX_STR - 1); - strncpy (prev.clip_end, curr.clip_end, MAX_STR - 1); - strncpy (prev.src, curr.src, MAX_STR - 1); - strncpy (curr.clip_begin, my_attribute->clip_begin, MAX_STR - 1); - strncpy (curr.clip_end, my_attribute->clip_end, MAX_STR - 1); - strncpy (curr.src, my_attribute->src, MAX_STR - 1); - if (strcasecmp (orig.clip_begin, curr.clip_begin) == 0 && - strcasecmp (orig.src, curr.src) == 0) + { + misc->has_audio_tag = 1; + get_clips (misc, my_attribute); + daisy[x].begin = misc->clip_begin; + daisy[x].duration += misc->clip_end - misc->clip_begin; + +// get clip_end + while (1) { - open_smil_file (misc, my_attribute, daisy[misc->playing].smil_file, - daisy[misc->playing].anchor); - while (1) + if (! get_tag_or_label (misc, my_attribute, parse)) + break; + if (x + 1 < misc->total_items) { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - if (strcasecmp (misc->tag , "audio") == 0) + if (*daisy[x + 1].clips_anchor) { - if (strcasecmp (my_attribute->clip_begin, - prev.clip_begin) == 0 && - strcasecmp (my_attribute->src, prev.src) == 0) + if (strcasecmp + (my_attribute->id, daisy[x + 1].clips_anchor) == 0) { - get_clips (misc, my_attribute->clip_begin, - my_attribute->clip_end); - play_now (misc, my_attribute, daisy); - return; - } // if (strcasecmp (my_attribute->clip_begin, prev.cli ... - } // if (strcasecmp (misc->tag , "audio") == 0) - } // while - } // if (strcasecmp (orig.clip_begin, curr.clip_begin) == 0 && + break; + } // if + } // if + } // if + if (strcasecmp (misc->tag, "audio") == 0) + { + get_clips (misc, my_attribute); + daisy[x].duration += misc->clip_end - misc->clip_begin; + } // IF + } // while + if (x < misc->total_items - 1 && *daisy[x + 1].clips_anchor) + if (strcasecmp + (my_attribute->id, daisy[x + 1].clips_anchor) == 0) + break; } // if (strcasecmp (misc->tag, "audio") == 0) } // while - } // if (clip_begin != daisy[misc->playing].begin) - -// go to end of previous item - misc->current = misc->displaying = --misc->playing; - if (misc->current < 0) + misc->total_time += daisy[x].duration; + xmlTextReaderClose (parse); + xmlFreeDoc (doc); + } // for + if (misc->total_time == 0) { beep (); - misc->current = misc->displaying = misc->playing = 0; - return; - } // if - open_smil_file (misc, my_attribute, daisy[misc->current].smil_file, daisy[misc->current].anchor); - while (1) - { -// search last clip - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - break; - if (strcasecmp (my_attribute->class, "pagenum") == 0) - { - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - } while (strcasecmp (misc->tag, "/par") != 0); - } // if (strcasecmp (my_attribute->class, "pagenum") == 0) - if (strcasecmp (misc->tag, "audio") == 0) - { - strncpy (curr.clip_begin, my_attribute->clip_begin, MAX_STR - 1); - strncpy (curr.clip_end, my_attribute->clip_end, MAX_STR - 1); - strncpy (curr.src, my_attribute->src, MAX_STR - 1); - } // if (strcasecmp (misc->tag, "audio") == 0) - if (strcasecmp (my_attribute->id, daisy[misc->current + 1].anchor) == 0) - break; - } // while - misc->just_this_item = -1; - open_smil_file (misc, my_attribute, daisy[misc->current].smil_file, - daisy[misc->current].anchor); - while (1) - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - if (strcasecmp (misc->tag , "audio") == 0) - { - if (strcasecmp (my_attribute->clip_begin, curr.clip_begin) == 0 && - strcasecmp (my_attribute->src, curr.src) == 0) - { - strncpy (misc->current_audio_file, my_attribute->src, MAX_STR - 1); - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - view_screen (misc, daisy); - play_now (misc, my_attribute, daisy); - return; - } // if (strcasecmp (my_attribute->clip_begin, curr.clip_begin) == 0 && - } // if (strcasecmp (misc->tag , "audio") == 0) - } // while -} // skip_left - -void skip_right (misc_t *misc) -{ - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - return; - if (misc->playing == -1) - return; - if (misc->cd_type != CDIO_DISC_MODE_CD_DA) - { - kill (misc->player_pid, SIGKILL); - misc->player_pid = -2; + quit_daisy_player (misc, daisy); + printf ("%s\n", gettext ( + "This book has no audio. Play this book with eBook-speaker")); + _exit (0); } // if -} // skip_right +} // calculate_times_3 void change_level (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, char key) @@ -1062,18 +813,16 @@ void change_level (misc_t *misc, my_attribute_t *my_attribute, if (key == 'L') if (--misc->level < 1) misc->level = misc->depth; - mvwprintw (misc->titlewin, 1, 0, gettext ("Please wait... -------------------------")); + mvwprintw (misc->titlewin, 1, 0, + gettext ("Please wait... -------------------------")); wprintw (misc->titlewin, "----------------------------------------"); wrefresh (misc->titlewin); c = misc->current; l = misc->level; if (strcasestr (misc->daisy_version, "2.02")) - read_daisy_2 (misc, my_attribute, daisy); + fill_daisy_struct_2 (misc, my_attribute, daisy); if (strcasestr (misc->daisy_version, "3")) - { - read_daisy_3 (misc, my_attribute, daisy); - parse_smil_3 (misc, my_attribute, daisy); - } // if + calculate_times_3 (misc, my_attribute, daisy); misc->current = c; misc->level = l; if (daisy[misc->current].level > misc->level) @@ -1082,22 +831,27 @@ void change_level (misc_t *misc, my_attribute_t *my_attribute, wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); } // change_level -void read_rc (misc_t *misc, my_attribute_t *my_attribute) +void read_preferences (misc_t *misc, my_attribute_t *my_attribute) { +// read the preferences from $PWD/.daisy-player.xml char str[MAX_STR]; struct passwd *pw;; xmlTextReaderPtr reader; - xmlDocPtr doc; + htmlDocPtr doc; pw = getpwuid (geteuid ()); - snprintf (str, MAX_STR - 1, "%s/.daisy-player.rc", pw->pw_dir); - doc = xmlRecoverFile (str); + snprintf (str, MAX_STR - 1, "%s/.daisy-player.xml", pw->pw_dir); + if ((doc = htmlParseFile (str, "UTF-8")) == NULL) + { + strncpy (misc->sound_dev, "hw:0", MAX_STR - 1); + return; + } // if if (! (reader = xmlReaderWalker (doc))) { strncpy (misc->sound_dev, "hw:0", MAX_STR - 1); return; } // if - do + do { if (! get_tag_or_label (misc, my_attribute, reader)) break; @@ -1106,16 +860,16 @@ void read_rc (misc_t *misc, my_attribute_t *my_attribute) xmlFreeDoc (doc); if (misc->cddb_flag != 'n' && misc->cddb_flag != 'y') misc->cddb_flag = 'y'; -} // read_rc +} // read_preferences -void save_rc (misc_t *misc) +void save_xml (misc_t *misc) { struct passwd *pw; char str[MAX_STR]; xmlTextWriterPtr writer; pw = getpwuid (geteuid ()); - snprintf (str, MAX_STR - 1, "%s/.daisy-player.rc", pw->pw_dir); + snprintf (str, MAX_STR - 1, "%s/.daisy-player.xml", pw->pw_dir); if (! (writer = xmlNewTextWriterFilename (str, 0))) return; xmlTextWriterStartDocument (writer, NULL, NULL, NULL); @@ -1131,17 +885,21 @@ void save_rc (misc_t *misc) xmlTextWriterEndElement (writer); xmlTextWriterEndDocument (writer); xmlFreeTextWriter (writer); -} // save_rc +} // save_xml -void quit_daisy_player (misc_t *misc) +void quit_daisy_player (misc_t *misc, daisy_t *daisy) { + view_screen (misc, daisy); endwin (); kill (misc->player_pid, SIGKILL); - misc->player_pid = -2; + if (misc->cd_type == CDIO_DISC_MODE_CD_DA) + kill (misc->cdda_pid, SIGKILL); put_bookmark (misc); - save_rc (misc); + save_xml (misc); close (misc->tmp_wav_fd); + unlink (misc->tmp_wav); puts (""); + remove_tmp_dir (misc); } // quit_daisy_player void search (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, @@ -1149,23 +907,28 @@ void search (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, { int c, found = 0, flag = 0; - if (misc->playing != -1) + if (misc->playing > -1) { + kill (misc->player_pid, SIGKILL); + misc->player_pid = -2; + misc->playing = misc->just_this_item = -1; + view_screen (misc, daisy); flag = 1; - pause_resume (misc, my_attribute, daisy); } // if if (mode == '/') { + misc->playing = misc->just_this_item = -1; mvwprintw (misc->titlewin, 1, 0, "----------------------------------------"); wprintw (misc->titlewin, "----------------------------------------"); - mvwprintw (misc->titlewin, 1, 0, gettext ("What do you search? ")); + mvwprintw (misc->titlewin, 1, 0, "%s ", + gettext ("What do you search?")); echo (); wgetnstr (misc->titlewin, misc->search_str, 25); noecho (); } // if if (mode == '/' || mode == 'n') { - for (c = start; c <= misc->total_items + 1; c++) + for (c = start; c < misc->total_items; c++) { if (strcasestr (daisy[c].label, misc->search_str)) { @@ -1197,7 +960,7 @@ void search (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, } // for if (! found) { - for (c = misc->total_items + 1; c > start; c--) + for (c = misc->total_items - 1; c > start; c--) { if (strcasestr (daisy[c].label, misc->search_str)) { @@ -1209,9 +972,10 @@ void search (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, } // if if (found) { - misc->playing = misc->displaying= misc->current = c; + misc->playing = misc->displaying = misc->current = c; misc->clip_begin = daisy[misc->current].begin; misc->just_this_item = -1; + misc->current_page_number = daisy[misc->current].page_number; view_screen (misc, daisy); if (misc->cd_type == CDIO_DISC_MODE_CD_DA) { @@ -1220,8 +984,8 @@ void search (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, daisy[misc->current].first_lsn); } else - open_smil_file (misc, my_attribute, daisy[misc->current].smil_file, - daisy[misc->current].anchor); + open_clips_file (misc, my_attribute, daisy[misc->current].clips_file, + daisy[misc->current].clips_anchor); } else { @@ -1237,159 +1001,28 @@ void search (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, } else { - skip_left (misc, my_attribute, daisy); - skip_right (misc); + pause_resume (misc, my_attribute, daisy); } // if } // if } // search -void go_to_page_number (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) -{ - char filename[MAX_STR], *anchor = 0; - char pn[15], href[MAX_STR], prev_href[MAX_STR]; - - kill (misc->player_pid, SIGKILL); - misc->player_pid = -2; - mvwprintw (misc->titlewin, 1, 0, "----------------------------------------"); - wprintw (misc->titlewin, "----------------------------------------"); - mvwprintw (misc->titlewin, 1, 0, gettext ("Go to page number: ")); - echo (); - wgetnstr (misc->titlewin, pn, 5); - noecho (); - view_screen (misc, daisy); - if (! *pn || atoi (pn) > misc->total_pages || ! atoi (pn)) - { - beep (); - skip_left (misc, my_attribute, daisy); - skip_right (misc); - return; - } // if - if (strcasestr (misc->daisy_version, "2.02")) - { - xmlTextReaderClose (misc->reader); - xmlDocPtr doc = xmlRecoverFile (misc->NCC_HTML); - if (! (misc->reader = xmlReaderWalker (doc))) - { - int e; - char str[MAX_STR]; - - e = errno; - snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->NCC_HTML); - failure (str, e); - } // if - *href = 0; - while (1) - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - if (strcasecmp (misc->tag, "a") == 0) - { - strncpy (prev_href, href, MAX_STR - 1); - strncpy (href, my_attribute->href, MAX_STR - 1); - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - } while (! *misc->label); - if (strcasecmp (misc->label, pn) == 0) - break; - } // if (strcasecmp (misc->tag, "a") == 0) - } // while - if (*prev_href) - { - strncpy (filename, prev_href, MAX_STR - 1); - if (strchr (filename, '#')) - { - anchor = strdup (strchr (filename, '#') + 1); - *strchr (filename, '#') = 0; - } // if - } // if (*prev_href) - for (misc->current = misc->total_items - 1; misc->current >= 0; misc->current--) - { - if (! daisy[misc->current].page_number) - continue; - if (atoi (pn) >= daisy[misc->current].page_number) - break; - } // for - misc->playing = misc->displaying = misc->current; - view_screen (misc, daisy); - misc->current_page_number = atoi (pn); - wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); - misc->just_this_item = -1; - open_smil_file (misc, my_attribute, daisy[misc->current].smil_file, anchor); - free (anchor); - return; - } // if (strcasestr (misc->daisy_version, "2.02")) - - if (strcasestr (misc->daisy_version, "3")) - { - char *anchor = 0; - - xmlTextReaderClose (misc->reader); - xmlDocPtr doc = xmlRecoverFile (misc->NCC_HTML); - if (! (misc->reader = xmlReaderWalker (doc))) - { - int e; - char str[MAX_STR]; - - e = errno; - snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->NCC_HTML); - failure (str, e); - } // if - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - { - xmlFreeDoc (doc); - return; - } // if - } while (strcasecmp (misc->tag, "pageTarget") != 0 || - strcasecmp (my_attribute->value, pn) != 0); - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - { - xmlTextReaderClose (misc->reader); - xmlFreeDoc (doc); - return; - } // if - } while (strcasecmp (misc->tag, "content") != 0); - xmlFreeDoc (doc); - if (strchr (my_attribute->src, '#')) - { - anchor = strdup (strchr (my_attribute->src, '#') + 1); - *strchr (my_attribute->src, '#') = 0; - } // if - // search current item - for (misc->current = misc->total_items - 1; misc->current >= 0; misc->current--) - { - if (! daisy[misc->current].page_number) - continue; - if (atoi (pn) >= daisy[misc->current].page_number) - break; - } // for - misc->playing = misc->displaying = misc->current; - view_screen (misc, daisy); - misc->current_page_number = atoi (pn); - wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); - misc->just_this_item = -1; - open_smil_file (misc, my_attribute, my_attribute->src, anchor); - } // if (strcasestr (misc->daisy_version, "3")) -} // go_to_page_number - void go_to_time (misc_t *misc, daisy_t *daisy, my_attribute_t *my_attribute) { char time_str[10]; int secs; kill (misc->player_pid, SIGKILL); - misc->player_pid = -2; + if (misc->cd_type != CDIO_DISC_MODE_CD_DA) + misc->player_pid = -2; + misc->just_this_item = -1; + misc->playing = misc->displaying = misc->current; + view_screen (misc, daisy); mvwprintw (misc->titlewin, 1, 0, "----------------------------------------"); wprintw (misc->titlewin, "----------------------------------------"); while (1) { - mvwprintw (misc->titlewin, 1, 0, gettext ("Go to time (MM:SS): ")); + mvwprintw (misc->titlewin, 1, 0, "%s ", + gettext ("Go to time (MM:SS):")); echo (); wgetnstr (misc->titlewin, time_str, 5); noecho (); @@ -1420,78 +1053,21 @@ void go_to_time (misc_t *misc, daisy_t *daisy, my_attribute_t *my_attribute) misc->player_pid = play_track (misc, misc->sound_dev, "alsa", daisy[misc->current].first_lsn + (secs * 75)); misc->elapsed_seconds = time (NULL) - secs; - } - else - { - misc->clip_begin = 0; - open_smil_file (misc, my_attribute, daisy[misc->current].smil_file, - daisy[misc->current].anchor); - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - break; - if (strcasecmp (misc->tag, "audio") == 0) - { - get_clips (misc, my_attribute->clip_begin, - my_attribute->clip_end); - } // if - } while (misc->clip_begin / misc->speed < secs); - skip_left (misc, my_attribute, daisy); + misc->prev_id = strdup (misc->current_id); + return; } // if - misc->playing = misc->displaying = misc->current; -} // go_to_time -void select_next_output_device (misc_t *misc, daisy_t *daisy) -{ - FILE *r; - int n, y; - size_t bytes; - char *list[10], *trash; - - wclear (misc->screenwin); - wprintw (misc->screenwin, "\n%s\n\n", gettext ("Select a soundcard:")); - if (! (r = fopen ("/proc/asound/cards", "r"))) - failure (gettext ("Cannot read /proc/asound/cards"), errno); - for (n = 0; n < 10; n++) - { - list[n] = (char *) malloc (1000); - bytes = getline (&list[n], &bytes, r); - if ((int) bytes == -1) - break; - trash = (char *) malloc (1000); - bytes = getline (&trash, &bytes, r); - free (trash); - wprintw (misc->screenwin, " %s", list[n]); - free (list[n]); - } // for - fclose (r); - y = 3; - nodelay (misc->screenwin, FALSE); - for (;;) + misc->clip_begin = 0; + open_clips_file (misc, my_attribute, daisy[misc->current].clips_file, + daisy[misc->current].clips_anchor); + misc->current_id = strdup (daisy[misc->current].first_id); + do { - wmove (misc->screenwin, y, 2); - switch (wgetch (misc->screenwin)) - { - case 13: - snprintf (misc->sound_dev, 15, "hw:%i", y - 3); - view_screen (misc, daisy); - nodelay (misc->screenwin, TRUE); - return; - case KEY_DOWN: - if (++y == n + 3) - y = 3; - break; - case KEY_UP: - if (--y == 2) - y = n + 2; - break; - default: - view_screen (misc, daisy); - nodelay (misc->screenwin, TRUE); - return; - } // switch - } // for -} // select_next_output_device + get_next_clips (misc, my_attribute, daisy); + } while (misc->clip_begin / misc->speed < secs); + start_playing (misc, daisy); + view_screen (misc, daisy); +} // go_to_time void browse (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy, char *wd) @@ -1499,6 +1075,14 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, int old_screen, i; char str[MAX_STR]; + for (misc->current = 0; misc->current < misc->total_items; misc->current++) + { + daisy[misc->current].screen = misc->current / misc->max_y; + daisy[misc->current].y = + misc->current - daisy[misc->current].screen * misc->max_y; + if (strlen (daisy[misc->current].label) + daisy[misc->current].x > 60) + daisy[misc->current].label[60 - daisy[misc->current].x] = 0; + } // for misc->current = 0; misc->pause_resume_playing = misc->just_this_item = -1; misc->label_len = 0; @@ -1511,10 +1095,21 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, daisy[i].page_number = 0; } // for misc->depth = 1; + misc->player_pid = play_track (misc, misc->sound_dev, "alsa", + daisy[misc->current].first_lsn + (misc->seconds * 75)); + misc->elapsed_seconds = time (NULL) - misc->seconds; } // if view_screen (misc, daisy); nodelay (misc->screenwin, TRUE); wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); + if (misc->cd_type != CDIO_DISC_MODE_CD_DA && misc->has_audio_tag == 0) + { + beep (); + quit_daisy_player (misc, daisy); + printf ("%s\n", gettext ( + "This book has no audio. Play this book with eBook-speaker")); + _exit (0); + } // if for (;;) { @@ -1524,6 +1119,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, misc->just_this_item = -1; view_screen (misc, daisy); misc->playing = misc->displaying = misc->current; + misc->current_id = strdup (""); misc->current_page_number = daisy[misc->playing].page_number; if (misc->player_pid > -1) kill (misc->player_pid, SIGKILL); @@ -1548,7 +1144,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, default: break; } // switch - quit_daisy_player (misc); + quit_daisy_player (misc, daisy); _exit (0); } // if if (misc->cd_type == CDIO_DISC_MODE_CD_DA) @@ -1556,18 +1152,16 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, misc->player_pid = play_track (misc, misc->sound_dev, "alsa", daisy[misc->current].first_lsn); misc->elapsed_seconds = time (NULL); - } - else - { - open_smil_file (misc, my_attribute, - daisy[misc->current].smil_file, - daisy[misc->current].anchor); - misc->elapsed_seconds = time (NULL); + break; } // if + open_clips_file (misc, my_attribute, + daisy[misc->current].clips_file, + daisy[misc->current].clips_anchor); + misc->elapsed_seconds = time (NULL); break; case '/': if (misc->discinfo) - { + { beep (); break; } // if @@ -1590,6 +1184,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, break; } // if store_to_disk (misc, my_attribute, daisy); + view_screen (misc, daisy); break; case 'e': case '.': @@ -1600,19 +1195,14 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, break; } // if xmlTextReaderClose (misc->reader); - quit_daisy_player (misc); + quit_daisy_player (misc, daisy); while (kill (misc->player_pid, 0) == 0); - if (chdir ("/") == 0) + snprintf (misc->cmd, MAX_CMD, "eject -pm %s", misc->cd_dev); + switch (system (misc->cmd)) { - char cmd[MAX_CMD + 1]; - - snprintf (cmd, MAX_CMD, "eject %s", misc->cd_dev); - switch (system (cmd)) - { - default: - _exit (0); - } // switch - } // if + default: + break; + } // switch _exit (0); case 'f': if (misc->playing == -1) @@ -1628,6 +1218,11 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, go_to_time (misc, daisy, my_attribute); break; case 'G': + if (misc->discinfo) + { + beep (); + break; + } // if if (misc->total_pages) go_to_page_number (misc, my_attribute, daisy); else @@ -1635,30 +1230,8 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, break; case 'h': case '?': - { - int flag = 0; - - if (misc->playing < 0) - flag = 1; - if (! misc->discinfo) - pause_resume (misc, my_attribute, daisy); - misc->player_pid = -2; - help (misc, daisy); - if (flag) - break; - misc->playing = misc->displaying; - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - { - misc->playing = -1; - pause_resume (misc, my_attribute, daisy); - } - else - { - skip_left (misc, my_attribute, daisy); - skip_right (misc); - } // if + help (misc, my_attribute, daisy); break; - } case 'j': case '5': case KEY_B2: @@ -1674,7 +1247,8 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, mvwprintw (misc->screenwin, daisy[misc->displaying].y, 0, " "); if (misc->playing == -1) { - misc->just_this_item = misc->displaying = misc->playing = misc->current; + misc->just_this_item = misc->displaying = misc->playing = + misc->current; kill (misc->player_pid, SIGKILL); misc->player_pid = -2; if (misc->cd_type == CDIO_DISC_MODE_CD_DA) @@ -1683,8 +1257,9 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, daisy[misc->current].first_lsn); } else - open_smil_file (misc, my_attribute, - daisy[misc->current].smil_file, daisy[misc->current].anchor); + open_clips_file (misc, my_attribute, + daisy[misc->current].clips_file, + daisy[misc->current].clips_anchor); } // if wattron (misc->screenwin, A_BOLD); if (misc->just_this_item != -1 && @@ -1729,38 +1304,22 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, search (misc, my_attribute, daisy, misc->current - 1, 'N'); break; case 'o': - pause_resume (misc, my_attribute, daisy); - select_next_output_device (misc, daisy); - misc->playing = misc->displaying; - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - { - misc->playing = -1; - pause_resume (misc, my_attribute, daisy); - } - else - { - skip_left (misc, my_attribute, daisy); - skip_right (misc); - } // if + select_next_output_device (misc, my_attribute, daisy); break; case 'p': put_bookmark (misc); break; case 'q': - quit_daisy_player (misc); + quit_daisy_player (misc, daisy); _exit (0); case 's': - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - kill (misc->player_pid, SIGKILL); - else - { - kill (misc->player_pid, SIGKILL); + kill (misc->player_pid, SIGKILL); + if (misc->cd_type != CDIO_DISC_MODE_CD_DA) misc->player_pid = -2; - } // if misc->playing = misc->just_this_item = -1; - misc->phrase_nr = 0; view_screen (misc, daisy); - wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); + wmove (misc->screenwin, daisy[misc->current].y, + daisy[misc->current].x); break; case KEY_DOWN: case '2': @@ -1799,7 +1358,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, struct passwd *pw; pw = getpwuid (geteuid ()); - quit_daisy_player (misc); + quit_daisy_player (misc, daisy); snprintf (str, MAX_STR - 1, "%s/.daisy-player/%s%s", pw->pw_dir, misc->bookmark_title, get_mcn (misc)); unlink (str); @@ -1810,7 +1369,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, misc->lsn_cursor); break; } // if - skip_right (misc); + skip_right (misc, daisy); break; case KEY_LEFT: case '4': @@ -1823,7 +1382,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, if (misc->playing > 0) if (misc->just_this_item > -1) misc->lsn_cursor = daisy[misc->playing].first_lsn; - else + else misc->current = misc->displaying = --misc->playing; else if (misc->lsn_cursor < daisy[misc->playing].first_lsn) @@ -1845,7 +1404,8 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, old_screen = daisy[misc->current].screen; while (daisy[++misc->current].screen == old_screen); view_screen (misc, daisy); - wmove (misc->screenwin, daisy[misc->current].y, daisy[misc->current].x); + wmove (misc->screenwin, daisy[misc->current].y, + daisy[misc->current].x); break; case KEY_PPAGE: case '9': @@ -1869,17 +1429,18 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, beep (); break; } // if + pause_resume (misc, my_attribute, daisy); misc->speed += 0.1; if (misc->cd_type == CDIO_DISC_MODE_CD_DA) { kill (misc->player_pid, SIGKILL); - misc->player_pid = + misc->player_pid = play_track (misc, misc->sound_dev, "alsa", misc->lsn_cursor); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); break; } // if - skip_left (misc, my_attribute, daisy); - kill (misc->player_pid, SIGKILL); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); break; case 'D': @@ -1889,47 +1450,79 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, beep (); break; } // if + pause_resume (misc, my_attribute, daisy); misc->speed -= 0.1; if (misc->cd_type == CDIO_DISC_MODE_CD_DA) { kill (misc->player_pid, SIGKILL); misc->player_pid = play_track (misc, misc->sound_dev, "alsa", misc->lsn_cursor); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); break; } // if - skip_left (misc, my_attribute, daisy); - kill (misc->player_pid, SIGKILL); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); break; case KEY_HOME: case '*': - case '7': + pause_resume (misc, my_attribute, daisy); misc->speed = 1; if (misc->cd_type == CDIO_DISC_MODE_CD_DA) { - kill (misc->player_pid, SIGKILL); misc->player_pid = play_track (misc, misc->sound_dev, "alsa", misc->lsn_cursor); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); break; } // if - kill (misc->player_pid, SIGKILL); - skip_left (misc, my_attribute, daisy); - skip_right (misc); + pause_resume (misc, my_attribute, daisy); view_screen (misc, daisy); break; + case 'v': + case '1': + if (misc->volume <= 0) + { + beep (); + break; + } // if + misc->volume -= 0.1; + if (misc->playing == -1) + break; + pause_resume (misc, my_attribute, daisy); + pause_resume (misc, my_attribute, daisy); + break; + case 'V': + case '7': + if (misc->volume >= 3) + { + beep (); + break; + } // if + misc->volume += 0.1; + if (misc->playing == -1) + break; + pause_resume (misc, my_attribute, daisy); + pause_resume (misc, my_attribute, daisy); + break; default: beep (); break; } // switch - + if (misc->playing > -1 && misc->cd_type != CDIO_DISC_MODE_CD_DA) { - play_clip (misc, my_attribute, daisy); + if (kill (misc->player_pid, 0) != 0) + { +// if not playing + misc->player_pid = -2; + misc->prev_id = strdup (misc->audio_id); + get_next_clips (misc, my_attribute, daisy); + start_playing (misc, daisy); + view_screen (misc, daisy); + } // if view_time (misc, daisy); } // if - if (misc->playing == -1 || misc->cd_type != CDIO_DISC_MODE_CD_DA) { fd_set rfds; @@ -1942,7 +1535,6 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, // pause till a key has been pressed or 0.1 misc->elapsed_seconds are elapsed select (1, &rfds, NULL, NULL, &tv); } // if - if (misc->playing > -1 && misc->cd_type == CDIO_DISC_MODE_CD_DA) { int16_t *p_readbuf; @@ -1964,7 +1556,7 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, struct passwd *pw; pw = getpwuid (geteuid ()); - quit_daisy_player (misc); + quit_daisy_player (misc, daisy); snprintf (str, MAX_STR - 1, "%s/.daisy-player/%s%s", pw->pw_dir, misc->bookmark_title, get_mcn (misc)); unlink (str); @@ -1985,12 +1577,13 @@ void browse (misc_t *misc, my_attribute_t *my_attribute, void usage () { + beep (); printf (gettext ("Daisy-player - Version %s %s"), PACKAGE_VERSION, "\n"); - puts ("(C)2003-2015 J. Lemmens"); - printf (gettext ( - "%sUsage: %s [[directory_with_a_Daisy-structure | Daisy_book_archive]] "), - "\n", PACKAGE); - printf ("%s\n", gettext ("[-c cdrom_device] [-d ALSA_sound_device]")); + puts ("(C)2003-2017 J. Lemmens\n"); + printf (gettext + ("Usage: %s [directory_with_a_Daisy-structure] | [Daisy_book_archive]"), + PACKAGE); + printf ("\n%s ", gettext ("[-c cdrom_device] [-d ALSA_sound_device]")); printf ("[-i] [-n | -y]\n"); fflush (stdout); _exit (1); @@ -2003,7 +1596,7 @@ char *get_mount_point (misc_t *misc) char *str = NULL; if (! (proc = fopen ("/proc/mounts", "r"))) - failure (gettext ("Cannot read /proc/mounts."), errno); + failure (misc, gettext ("Cannot read /proc/mounts."), errno); while (1) { str = malloc (len + 1); @@ -2013,14 +1606,13 @@ char *get_mount_point (misc_t *misc) break; } // while fclose (proc); - if (strcasestr (str, "iso9660") || strcasestr (str, "udf")) + if (strcasestr (str, "iso9660") || + strcasestr (str, "udf")) { - strncpy (misc->daisy_mp, strchr (str, ' ') + 1, MAX_STR - 1); + misc->daisy_mp = strdup (strchr (str, ' ') + 1); *strchr (misc->daisy_mp, ' ') = 0; - free (str); return misc->daisy_mp; } // if - free (str); return NULL; } // get_mount_point @@ -2030,9 +1622,9 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute, int h, m, s; float t = 0; xmlTextReaderPtr di, ncc; - xmlDocPtr doc; + htmlDocPtr doc; - doc = xmlRecoverFile (discinfo_html); + doc = htmlParseFile (discinfo_html, "UTF-8"); if (! (di = xmlReaderWalker (doc))) { int e; @@ -2040,7 +1632,7 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute, e = errno; snprintf (str, MAX_STR, gettext ("Cannot read %s"), discinfo_html); - failure (str, e); + failure (misc, str, e); } // if (! (di = xmlReaderWalker (doc) while (1) { @@ -2057,8 +1649,10 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute, } // if (strcasecmp (misc->tag, "title") == 0) if (strcasecmp (misc->tag, "a") == 0) { - strncpy (daisy[misc->current].filename, my_attribute->href, MAX_STR - 1); - xmlDocPtr doc = xmlRecoverFile (daisy[misc->current].filename); + strncpy (daisy[misc->current].filename, my_attribute->href, + MAX_STR - 1); + htmlDocPtr doc = + htmlParseFile (daisy[misc->current].filename, "UTF-8"); if (! (ncc = xmlReaderWalker (doc))) { int e; @@ -2067,7 +1661,7 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute, e = errno; snprintf (str, MAX_STR, gettext ("Cannot read %s"), daisy[misc->current].filename); - failure (str, e); + failure (misc, str, e); } // if do { @@ -2084,9 +1678,9 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute, if (! get_tag_or_label (misc, my_attribute, di)) break; } while (! *misc->label); - strncpy (daisy[misc->current].label, misc->label, 80); - strncpy (daisy[misc->current].daisy_mp, dirname (daisy[misc->current].filename), - MAX_STR - 1); + *daisy[misc->current].label = 0; + strncpy (daisy[misc->current].daisy_mp, + dirname (daisy[misc->current].filename), MAX_STR - 1); daisy[misc->current].level = 1; daisy[misc->current].x = 0; daisy[misc->current].y = misc->displaying; @@ -2112,30 +1706,42 @@ void handle_discinfo (misc_t *misc, my_attribute_t *my_attribute, int main (int argc, char *argv[]) { int opt; - char str[MAX_STR], DISCINFO_HTML[MAX_STR], start_wd[MAX_STR]; + char str[MAX_STR], DISCINFO_HTML[MAX_STR], *start_wd; misc_t misc; my_attribute_t my_attribute; - daisy_t *daisy = NULL; + daisy_t *daisy; + struct sigaction usr_action; - misc.daisy_player_pid = getpid (); - misc.speed = 1; + daisy = NULL; + misc.tmp_dir = misc.label = NULL; + misc.speed = misc.volume = 1; misc.playing = misc.just_this_item = -1; misc.discinfo = 0; misc.cd_type = -1; misc.ignore_bookmark = 0; + *misc.bookmark_title = 0; + misc.current_id = strdup (""); + misc.prev_id = misc.audio_id = strdup (""); + misc.total_time = 0; + *misc.daisy_title = 0; + *misc.ncc_html = 0; strncpy (misc.cd_dev, "/dev/sr0", 15); - signal (SIGCHLD, player_ended); - read_rc (&misc, &my_attribute); + usr_action.sa_handler = player_ended; + usr_action.sa_flags = 0; + sigaction (SIGCHLD, &usr_action, NULL); + read_preferences (&misc, &my_attribute); if (! setlocale (LC_ALL, "")) - failure ("setlocale ()", errno); + failure (&misc, "setlocale ()", errno); if (! setlocale (LC_NUMERIC, "C")) - failure ("setlocale ()", errno); + failure (&misc, "setlocale ()", errno); textdomain (PACKAGE); snprintf (str, MAX_STR, "%s/", LOCALEDIR); bindtextdomain (PACKAGE, str); - strncpy (start_wd, get_current_dir_name (), MAX_STR - 1); + make_tmp_dir (&misc); + start_wd = strdup (get_current_dir_name ()); opterr = 0; - while ((opt = getopt (argc, argv, "c:d:iny")) != -1) + misc.use_OPF = misc.use_NCX = 0; + while ((opt = getopt (argc, argv, "c:d:ijnyON")) != -1) { switch (opt) { @@ -2163,26 +1769,51 @@ int main (int argc, char *argv[]) misc.cddb_flag = 'n'; } // switch break; + case 'N': + misc.use_NCX = 1; + break; + case 'O': + misc.use_OPF = 1; + break; default: + beep (); + remove_tmp_dir (&misc); usage (); } // switch } // while initscr (); if (! (misc.titlewin = newwin (2, 80, 0, 0)) || ! (misc.screenwin = newwin (23, 80, 2, 0))) - failure ("No curses", errno); + failure (&misc, "No curses", errno); fclose (stderr); getmaxyx (misc.screenwin, misc.max_y, misc.max_x); - printw ("(C)2003-2015 J. Lemmens\n"); + printw ("(C)2003-2017 J. Lemmens\n"); printw (gettext ("Daisy-player - Version %s %s"), PACKAGE_VERSION, ""); printw ("\n"); printw (gettext ("A parser to play Daisy CD's with Linux")); printw ("\n"); printw (gettext ("Scanning for a Daisy CD...")); refresh (); + misc.total_pages = 0; + if (argv[optind]) // if there is an argument { +// look if arg exists + if (access (argv[optind], R_OK) == -1) + { + int e; + + e = errno; + endwin (); + printf (gettext ("Daisy-player - Version %s %s"), + PACKAGE_VERSION, "\n"); + puts ("(C)2003-2017 J. Lemmens"); + beep (); + remove_tmp_dir (&misc); + failure (&misc, argv[optind], e); + } // if + // determine filetype magic_t myt; @@ -2197,14 +1828,29 @@ int main (int argc, char *argv[]) printf ("%s: %s\n", argv[optind], strerror (e)); beep (); fflush (stdout); + remove_tmp_dir (&misc); usage (); } // if if (strcasestr (magic_file (myt, argv[optind]), "directory")) { - strncpy (misc.daisy_mp, argv[optind], MAX_STR - 1); - } + if (*argv[optind] == '/') + { +// absolute path + misc.daisy_mp = strdup (argv[optind]); + } + else + { +// relative path + misc.daisy_mp = malloc (strlen (start_wd) + + strlen (argv[optind]) + 5); + strcpy (misc.daisy_mp, start_wd); + strcat (misc.daisy_mp, "/"); + strcat (misc.daisy_mp, argv[optind]); + } // if + } // directory else if (strcasestr (magic_file (myt, argv[optind]), "Zip archive") || + strcasestr (magic_file (myt, argv[optind]), "tar archive") || strcasestr (magic_file (myt, argv[optind]), "RAR archive data") || strcasestr (magic_file (myt, argv[optind]), "Microsoft Cabinet archive data") || @@ -2212,38 +1858,36 @@ int main (int argc, char *argv[]) "gzip compressed data") || strcasestr (magic_file (myt, argv[optind]), "bzip2 compressed data") || - strcasestr (magic_file (myt, argv[optind]), "ISO 9660")) + strcasestr (magic_file (myt, argv[optind]), "ISO 9660") || + strcasestr (magic_file (myt, argv[optind]), "EPUB document")) { - char *str, cmd[MAX_CMD]; - - str = strdup ("/tmp/daisy-player.XXXXXX"); - if (! mkdtemp (str)) - failure ("mkdtemp ()", errno); - snprintf (cmd, MAX_CMD - 1, "unar \"%s\" -o %s > /dev/null", - argv[optind], str); - switch (system (cmd)) + snprintf (misc.cmd, MAX_CMD - 1, + "/usr/bin/unar \"%s\" -o %s > /dev/null", + argv[optind], misc.tmp_dir); + switch (system (misc.cmd)) { default: break; } // switch - wrefresh (misc.screenwin); DIR *dir; struct dirent *dirent; int entries = 0; - if (! (dir = opendir (str))) - failure (str, errno); + if (! (dir = opendir (misc.tmp_dir))) + failure (&misc, misc.tmp_dir, errno); while ((dirent = readdir (dir)) != NULL) { if (strcasecmp (dirent->d_name, ".") == 0 || strcasecmp (dirent->d_name, "..") == 0) continue; - snprintf (misc.daisy_mp, MAX_STR - 1, "%s/%s", str, dirent->d_name); + misc.daisy_mp = + malloc (strlen (misc.tmp_dir) + strlen (dirent->d_name) + 5); + sprintf (misc.daisy_mp, "%s/%s", misc.tmp_dir, dirent->d_name); entries++; } // while if (entries > 1) - snprintf (misc.daisy_mp, MAX_STR - 1, "%s", str); + misc.daisy_mp = strdup (misc.tmp_dir); closedir (dir); } // if unar else @@ -2251,6 +1895,7 @@ int main (int argc, char *argv[]) endwin (); printf ("\n%s\n", gettext ("No DAISY-CD or Audio-cd found")); beep (); + remove_tmp_dir (&misc); usage (); } // if magic_close (myt); @@ -2258,35 +1903,41 @@ int main (int argc, char *argv[]) else // try misc.cd_dev { - if (access (misc.cd_dev, R_OK) != 0) - failure (misc.cd_dev, errno); - - char cmd[MAX_CMD], *tmp; time_t start; CdIo_t *cd; - snprintf (cmd, MAX_CMD, "eject -t %s", misc.cd_dev); - switch (system (cmd)) + snprintf (misc.cmd, MAX_CMD, "eject -tp %s", misc.cd_dev); + switch (system (misc.cmd)) { default: break; } // switch start = time (NULL); - tmp = strdup ("/tmp/daisy-player.XXXXXX"); - strncpy (misc.daisy_mp, mkdtemp (tmp), MAX_STR); + + misc.daisy_mp = strdup (misc.cd_dev); cd = NULL; cdio_init (); do { - if (time (NULL) - start >= 30) - failure (gettext ("No Daisy CD in drive."), errno); + if (time (NULL) - start >= 60) + { + endwin (); + printf ("%s\n", gettext ("No Daisy CD in drive.")); + remove_tmp_dir (&misc); + _exit (0); + } // if cd = cdio_open (misc.cd_dev, DRIVER_UNKNOWN); } while (cd == NULL); start = time (NULL); do { - if (time (NULL) - start >= 30) - failure (gettext ("No Daisy CD in drive."), errno); + if (time (NULL) - start >= 20) + { + endwin (); + printf ("%s\n", gettext ("No Daisy CD in drive.")); + remove_tmp_dir (&misc); + _exit (0); + } // if switch (misc.cd_type = cdio_get_discmode (cd)) { case CDIO_DISC_MODE_CD_DATA: /**< CD-ROM form 1 */ @@ -2307,12 +1958,18 @@ int main (int argc, char *argv[]) do // if not found a mounted cd, try to mount one { - if (time (NULL) - start >= 30) - failure (gettext ("No Daisy CD in drive."), errno); - snprintf (cmd, MAX_CMD, + if (time (NULL) - start >= 10) + { + endwin (); + printf ("%s\n", gettext ("No Daisy CD in drive.")); + remove_tmp_dir (&misc); + _exit (0); + } // if + snprintf (misc.cmd, MAX_CMD, "udisksctl mount -b %s > /dev/null", misc.cd_dev); - switch (system (cmd)) + switch (system (misc.cmd)) { + default: break; } // switch get_mount_point (&misc); @@ -2322,7 +1979,7 @@ int main (int argc, char *argv[]) case CDIO_DISC_MODE_CD_DA: /**< CD-DA */ { // probably an Audio-CD - printw ("\n%s", gettext ("Found an Audio-CD. ")); + printw ("\n%s ", gettext ("Found an Audio-CD.")); if (misc.cddb_flag == 'y') printw (gettext ("Get titles from freedb.freedb.org...")); refresh (); @@ -2331,15 +1988,18 @@ int main (int argc, char *argv[]) init_paranoia (&misc); daisy = get_number_of_tracks (&misc); get_toc_audiocd (&misc, daisy); - strncpy (misc.daisy_mp, "/tmp", MAX_STR - 1); + misc.daisy_mp = strdup ("/tmp"); break; } // TRACK_COUNT_AUDIO case CDIO_DISC_MODE_CD_I: case CDIO_DISC_MODE_DVD_OTHER: case CDIO_DISC_MODE_NO_INFO: case CDIO_DISC_MODE_ERROR: - failure (gettext ("No DAISY-CD or Audio-cd found"), errno); - } // switch + endwin (); + printf ("%s\n", gettext ("No DAISY-CD or Audio-cd found")); + remove_tmp_dir (&misc); + return 0; + } // switch } while (misc.cd_type == -1); } // if use misc.cd_dev keypad (misc.screenwin, TRUE); @@ -2354,36 +2014,37 @@ int main (int argc, char *argv[]) e = errno; snprintf (str, MAX_STR, "daisy_mp %s", misc.daisy_mp); - failure (str, e); + remove_tmp_dir (&misc); + failure (&misc, str, e); } // if if (misc.cd_type != CDIO_DISC_MODE_CD_DA) { - daisy = create_daisy_struct (&misc, &my_attribute); + daisy = create_daisy_struct (&misc, &my_attribute, daisy); snprintf (DISCINFO_HTML, MAX_STR - 1, "discinfo.html"); if (access (DISCINFO_HTML, R_OK) == 0) handle_discinfo (&misc, &my_attribute, daisy, DISCINFO_HTML); if (! misc.discinfo) { - snprintf (misc.NCC_HTML, MAX_STR - 1, "ncc.html"); - if (access (misc.NCC_HTML, R_OK) == 0) + misc.has_audio_tag = 0; + if (access (misc.ncc_html, R_OK) == 0) { - xmlDocPtr doc; +// this is daisy2 + htmlDocPtr doc; - doc = xmlRecoverFile (misc.NCC_HTML); + doc = htmlParseFile (misc.ncc_html, "UTF-8"); if (! (misc.reader = xmlReaderWalker (doc))) { int e; - char str[MAX_STR]; - e = errno; - snprintf (str, MAX_STR, - gettext ("Cannot read %s"), misc.NCC_HTML); - failure (str, e); + snprintf (misc.str, MAX_STR, + gettext ("Cannot read %s"), misc.ncc_html); + remove_tmp_dir (&misc); + failure (&misc, misc.str, e); } // if while (1) { if (*misc.bookmark_title) - // if misc.bookmark_title already is set +// if misc.bookmark_title already is set break; if (! get_tag_or_label (&misc, &my_attribute, misc.reader)) break; @@ -2398,21 +2059,58 @@ int main (int argc, char *argv[]) } // if } // if } // while - read_daisy_2 (&misc, &my_attribute, daisy); + fill_daisy_struct_2 (&misc, &my_attribute, daisy); } else { - read_daisy_3 (&misc, &my_attribute, daisy); +// this is daisy3 + int i; + strncpy (misc.daisy_version, "3", 2); + read_daisy_3 (&misc, &my_attribute, daisy); + for (i = 0; i < misc.total_items - 1; i++) + { + htmlDocPtr doc; + xmlTextReaderPtr last; + + if (! (doc = htmlParseFile (daisy[i].xml_file, "UTF-8"))) + failure (&misc, daisy[i].xml_file, errno); + if (! (last = xmlReaderWalker (doc))) + failure (&misc, daisy[i].xml_file, errno); + while (1) + { + if (! get_tag_or_label (&misc, &my_attribute, last)) + break; + if (strcasecmp (my_attribute.id, daisy[i + 1].anchor) == 0) + break; + if (*my_attribute.id) + strcpy (daisy[i].last_id, my_attribute.id); + } // while + xmlTextReaderClose (last); + xmlFreeDoc (doc); + } // for + fill_page_numbers (&misc, daisy, &my_attribute); + calculate_times_3 (&misc, &my_attribute, daisy); } // if if (misc.total_items == 0) misc.total_items = 1; } // if (! misc.discinfo); } // if misc.audiocd == 0 + if (*misc.bookmark_title == 0) + { + strncpy (misc.bookmark_title, misc.daisy_title, MAX_STR - 1); + if (strchr (misc.bookmark_title, '/')) + { + int i = 0; + + while (misc.bookmark_title[i] != 0) + misc.bookmark_title[i++] = '-'; + } // if + } // if wattron (misc.titlewin, A_BOLD); snprintf (str, MAX_STR - 1, gettext ( - "Daisy-player - Version %s - (C)2015 J. Lemmens"), PACKAGE_VERSION); + "Daisy-player - Version %s - (C)2017 J. Lemmens"), PACKAGE_VERSION); mvwprintw (misc.titlewin, 0, 0, str); wrefresh (misc.titlewin); @@ -2425,12 +2123,12 @@ int main (int argc, char *argv[]) mvwprintw (misc.titlewin, 1, 0, "----------------------------------------"); wprintw (misc.titlewin, "----------------------------------------"); - mvwprintw (misc.titlewin, 1, 0, gettext ("Press 'h' for help ")); + mvwprintw (misc.titlewin, 1, 0, "%s ", gettext ("Press 'h' for help")); misc.level = 1; *misc.search_str = 0; - snprintf (misc.tmp_wav, MAX_STR, "/tmp/daisy-player_XXXXXX"); + snprintf (misc.tmp_wav, MAX_STR, "%s/daisy-player.wav", misc.tmp_dir); if ((misc.tmp_wav_fd = mkstemp (misc.tmp_wav)) == 01) - failure ("mkstemp ()", errno); + failure (&misc, "mkstemp ()", errno); browse (&misc, &my_attribute, daisy, start_wd); return 0; } // main diff --git a/src/daisy.h b/src/daisy.h index d2220b4..85f3340 100644 --- a/src/daisy.h +++ b/src/daisy.h @@ -1,5 +1,5 @@ /* header file for daisy-player - * Copyright (C)2015 J. Lemmens + * Copyright (C)2017 J. Lemmens * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -14,12 +14,13 @@ * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + */ #define _GNU_SOURCE -#include <stdio.h> #include <string.h> +#include <libgen.h> +#include <stdio.h> #include <unistd.h> #include <strings.h> #include <stdlib.h> @@ -29,7 +30,6 @@ #include <sys/stat.h> #include <ncursesw/curses.h> #include <fcntl.h> -#include <libgen.h> #include <dirent.h> #include <pwd.h> #include <locale.h> @@ -41,6 +41,9 @@ #include <libxml/xmlreader.h> #include <libxml/xmlwriter.h> #include <libxml/HTMLparser.h> +#include <libxml/parserInternals.h> +#include <libxml/entities.h> +#include <libxml/catalog.h> #include <cdio/cdio.h> #include <cdio/cdda.h> #include <cdio/paranoia.h> @@ -57,17 +60,18 @@ #undef VERSION #include "config.h" -// jos #define MAX_PHRASE_LEN 2000 #define MAX_CMD 512 #define MAX_STR 256 #define MAX_TAG 1024 +#define DAISY_PLAYER typedef struct Daisy { int playorder, x, y, screen; float begin, duration; - char smil_file[MAX_STR], anchor[MAX_STR], class[MAX_STR]; - char label[100]; + char *xml_file, *anchor, *clips_file, *clips_anchor, *orig_smil; + char class[MAX_STR], label[100]; + char first_id[MAX_STR + 1], last_id[MAX_STR + 1]; int level, page_number; char daisy_mp[MAX_STR]; // discinfo char filename[MAX_STR]; // Audio-CD @@ -86,8 +90,8 @@ typedef struct My_attribute dtb_totalPageCount[MAX_STR], href[MAX_STR], http_equiv[MAX_STR], - id[MAX_STR], - idref[MAX_STR], + *id, + *idref, media_type[MAX_STR], name[MAX_STR], ncc_depth[MAX_STR], @@ -95,7 +99,7 @@ typedef struct My_attribute ncc_totalTime[MAX_STR], number[MAX_STR], playorder[MAX_STR], - src[MAX_STR], + *src, smilref[MAX_STR], toc[MAX_STR], value[MAX_STR]; @@ -105,25 +109,31 @@ typedef struct Misc { int discinfo, playing, just_this_item, current_page_number; int current, max_y, max_x, total_items, level, displaying, ignore_bookmark; - int phrase_nr, tts_no, depth, total_phrases, total_pages; - int pipefd[2], tmp_wav_fd; + int items_in_opf, items_in_ncx; + int tts_no, depth, total_pages; + int pipefd[2], tmp_wav_fd, has_audio_tag; int pause_resume_playing; - float pause_resume_clip_begin; - float speed, total_time; + char *pause_resume_id, *prev_id, *current_id, *audio_id; + float speed, total_time, volume; float clip_begin, clip_end; + htmlDocPtr doc; xmlTextReaderPtr reader; - pid_t daisy_player_pid, player_pid; - char NCC_HTML[MAX_STR], ncc_totalTime[MAX_STR]; + pid_t player_pid, cdda_pid; + time_t seconds; + char ncc_html[MAX_STR], ncc_totalTime[MAX_STR], ocr_language[5]; char daisy_version[MAX_STR], daisy_title[MAX_STR], daisy_language[MAX_STR]; - char daisy_mp[MAX_STR]; - char tag[MAX_TAG]; - char *label; + char *daisy_mp, *tmp_dir; + char tag[MAX_TAG], *label; int label_len; char bookmark_title[MAX_STR]; - char search_str[MAX_STR]; - char *wd, cd_dev[MAX_STR], sound_dev[MAX_STR]; + char search_str[MAX_STR + 1]; + char cd_dev[MAX_STR], sound_dev[MAX_STR]; char cddb_flag, opf_name[MAX_STR], ncx_name[MAX_STR]; - char current_audio_file[MAX_STR], tmp_wav[MAX_STR + 1], mcn[MAX_STR]; + char use_ncx, use_opf; + char *current_audio_file, tmp_wav[MAX_STR + 1], mcn[MAX_STR]; + char xmlversion[MAX_STR + 1]; + char cmd[MAX_CMD + 1], str[MAX_STR + 1]; + char *case_insensitive_file_name; time_t elapsed_seconds; WINDOW *screenwin, *titlewin; cdrom_paranoia_t *par; @@ -131,33 +141,49 @@ typedef struct Misc CdIo_t *p_cdio; int cd_type; lsn_t lsn_cursor, pause_resume_lsn_cursor; + int use_OPF, use_NCX; // for testing } misc_t; -extern void save_rc (misc_t *); +extern void save_xml (misc_t *); extern char *get_mcn (misc_t *); +extern void player_ended (); extern int get_tag_or_label (misc_t *, my_attribute_t *, xmlTextReaderPtr); -extern void get_label (misc_t *, daisy_t *, int); -extern void parse_ncx (misc_t *, my_attribute_t *, daisy_t *, char *); +extern void get_label_3 (misc_t *, my_attribute_t *, daisy_t *, int, + xmlTextReaderPtr); +extern void parse_ncx (misc_t *, my_attribute_t *, daisy_t *); +extern void skip_left (misc_t *, my_attribute_t *, daisy_t *); +extern void skip_right (misc_t *, daisy_t *); extern void usage (); extern pid_t play_track (misc_t *, char *, char *, lsn_t); -extern void get_clips (misc_t *, char *, char *); -extern void open_smil_file (misc_t *, my_attribute_t *, char *, char *); -extern void play_now (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy); -extern void get_page_number_3 (misc_t *, my_attribute_t *); -extern void skip_left (misc_t *, my_attribute_t *, daisy_t *); -extern void skip_right (misc_t *); +extern void get_clips (misc_t *, my_attribute_t *); +extern void open_clips_file (misc_t *, my_attribute_t *, char *, char *); +extern void open_text_file (misc_t *, my_attribute_t *, char *, char *); +extern void play_now (misc_t *, daisy_t *); +extern void start_playing (misc_t *, daisy_t *); +extern int get_page_number_2 (misc_t *, my_attribute_t *, daisy_t *, char *); +extern int get_page_number_3 (misc_t *, my_attribute_t *); +extern void get_next_clips (misc_t *, my_attribute_t *, daisy_t *); extern void set_drive_speed (misc_t *, int); -extern void quit_daisy_player (misc_t *); +extern void quit_daisy_player (misc_t *, daisy_t *); extern void read_daisy_3 (misc_t *, my_attribute_t *, daisy_t *); -void parse_smil_3 (misc_t *, my_attribute_t *, daisy_t *); -extern float read_time (char *); +extern void pause_resume (misc_t *, my_attribute_t *, daisy_t *); +extern float read_time (char *); extern void init_paranoia (misc_t *); extern void get_toc_audiocd (misc_t *, daisy_t *); extern void playfile (misc_t *, char *, char *, char *, char *, char *); extern void view_screen (misc_t *, daisy_t *); -extern daisy_t *create_daisy_struct (misc_t *, my_attribute_t *); +extern daisy_t *create_daisy_struct (misc_t *, my_attribute_t *, daisy_t *); extern daisy_t *get_number_of_tracks (misc_t *); -extern void failure (char *, int); +extern void failure (misc_t *, char *, int); extern void put_bookmark (misc_t *); +extern void parse_page_number (misc_t *, my_attribute_t *, xmlTextReaderPtr); +extern void fill_daisy_struct_2 (misc_t *, my_attribute_t *, daisy_t *); +extern void fill_page_numbers (misc_t *, daisy_t *, my_attribute_t *); +extern char *real_name (misc_t *, char *); +extern void go_to_page_number (misc_t *, my_attribute_t *, daisy_t *); +extern void parse_smil_3 (misc_t *, my_attribute_t *, daisy_t *); +extern void remove_tmp_dir (misc_t *); +extern void make_tmp_dir (misc_t *); +extern char *find_index_name (misc_t *, char *); +extern void select_next_output_device (misc_t *, my_attribute_t *, daisy_t *); diff --git a/src/daisy2.02.c b/src/daisy2.02.c new file mode 100644 index 0000000..6d9c3a6 --- /dev/null +++ b/src/daisy2.02.c @@ -0,0 +1,273 @@ +/* daisy2.02.c - functions to insert daisy2.02 info into a struct. + * + * Copyright (C)2003-2017 J. Lemmens + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by 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 General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "daisy.h" + +void parse_smil_2 (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) +{ +// function for daisy 2.02 + htmlDocPtr doc; + xmlTextReaderPtr parse; + +#ifdef DAISY_PLAYER + misc->total_time = 0; +#endif + for (misc->current = 0; misc->current != misc->total_items; + misc->current++) + { + if (*daisy[misc->current].clips_file == 0) + continue; + if (! (doc = htmlParseFile (daisy[misc->current].clips_file, "UTF-8"))) + failure (misc, daisy[misc->current].clips_file, errno); + if (! (parse = xmlReaderWalker (doc))) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, + gettext ("Cannot read %s"), daisy[misc->current].clips_file); + failure (misc, str, e); + } // if + +// parse this smil + if (*daisy[misc->current].clips_anchor) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, parse)) + break; + if (strcasecmp (my_attribute->id, + daisy[misc->current].clips_anchor) == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 5); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, + my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + daisy[misc->current].orig_smil = + strdup (daisy[misc->current].xml_file); + break; + } // if + } // while + } // if +#ifdef DAISY_PLAYER + daisy[misc->current].duration = 0; + *daisy[misc->current].first_id = 0; +#endif + while (1) + { + if (! get_tag_or_label (misc, my_attribute, parse)) + break; +#ifdef DAISY_PLAYER + if (strcasecmp (misc->tag, "audio") == 0) + { + if (! *daisy[misc->current].first_id) + { + if (*my_attribute->id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if + misc->has_audio_tag = 1; + misc->current_audio_file = + strdup (real_name (misc, my_attribute->src)); + get_clips (misc, my_attribute); + daisy[misc->current].begin = misc->clip_begin; + daisy[misc->current].duration += + misc->clip_end - misc->clip_begin; + while (1) + { + if (*my_attribute->id) + strncpy (daisy[misc->current].last_id, my_attribute->id, + MAX_STR); + if (! get_tag_or_label (misc, my_attribute, parse)) + break; + if (misc->current + 1 < misc->total_items && + daisy[misc->current + 1].clips_anchor != NULL) + { + if (strcasecmp (my_attribute->id, + daisy[misc->current + 1].clips_anchor) == 0) + { + break; + } // if + } // if + if (strcasecmp (misc->tag, "audio") == 0) + { + get_clips (misc, my_attribute); + daisy[misc->current].duration += + misc->clip_end - misc->clip_begin; + } // if (strcasecmp (misc->tag, "audio") == 0) + } // while + if (misc->current + 1 < misc->total_items) + if (*daisy[misc->current + 1].clips_anchor) + if (strcasecmp (my_attribute->id, + daisy[misc->current + 1].clips_anchor) == 0) + break; + } // if (strcasecmp (misc->tag, "audio") == 0) +#endif + if (strcasecmp (misc->tag, "text") == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 3); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = + strdup (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + if (misc->current + 1 < misc->total_items && + *daisy[misc->current + 1].clips_anchor && + strcasecmp (my_attribute->id, + daisy[misc->current + 1].clips_anchor) == 0) + { + break; + } // if + } // if + } // while + xmlTextReaderClose (parse); + xmlFreeDoc (doc); +#ifdef DAISY_PLAYER + misc->total_time += daisy[misc->current].duration; +#endif + } // for +} // parse_smil_2 + +void get_label_2 (misc_t *misc, daisy_t *daisy, int indent) +{ + strncpy (daisy[misc->current].label, misc->label, 80); + if (misc->displaying == misc->max_y) + misc->displaying = 1; + if (*daisy[misc->current].class) + { + if (strcasecmp (daisy[misc->current].class, "pagenum") == 0) + daisy[misc->current].x = 0; + else + if (daisy[misc->current].x == 0) + daisy[misc->current].x = indent + 3; + } // if +} // get_label_2 + +void fill_daisy_struct_2 (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ +// function for daisy 2.02 + int indent = 0; + xmlTextReaderPtr ncc; + htmlDocPtr doc; + + if (! (doc = htmlParseFile (misc->ncc_html, "UTF-8"))) + failure (misc, "fill_daisy_struct_2 ()", errno); + if (! (ncc = xmlReaderWalker (doc))) + { + int e; + + e = errno; + snprintf (misc->str, MAX_STR, gettext ("Cannot read %s"), misc->ncc_html); + failure (misc, misc->str, e); + } // if + + for (misc->current = 0; misc->current < misc->total_items; + misc->current++) + { + *daisy[misc->current].label = 0; + daisy[misc->current].page_number = 0; +#ifdef DAISY_PLAYER + *daisy[misc->current].class = 0; +#endif + } // for + misc->current = misc->displaying = misc->depth = 0; + while (1) + { + if (! get_tag_or_label (misc, my_attribute, ncc)) + break; + if (strcasecmp (my_attribute->class, "page-normal") == 0) + { + do + { + if (! get_tag_or_label (misc, my_attribute, ncc)) + break; + } while (*misc->label == 0); + daisy[misc->current].page_number = atoi (misc->label); + } // if (strcasecmp (my_attribute->class, "page-normal") + if (strcasecmp (misc->tag, "h1") == 0 || + strcasecmp (misc->tag, "h2") == 0 || + strcasecmp (misc->tag, "h3") == 0 || + strcasecmp (misc->tag, "h4") == 0 || + strcasecmp (misc->tag, "h5") == 0 || + strcasecmp (misc->tag, "h6") == 0) + { + daisy[misc->current].level = misc->tag[1] - '0'; + if (daisy[misc->current].level < 1) + daisy[misc->current].level = 1; + if (daisy[misc->current].level > misc->depth) + misc->depth = daisy[misc->current].level; + daisy[misc->current].x = daisy[misc->current].level + 3 - 1; + indent = daisy[misc->current].x = + (daisy[misc->current].level - 1) * 3 + 1; + do + { + if (! get_tag_or_label (misc, my_attribute, ncc)) + break; + } while (strcasecmp (misc->tag, "a") != 0); + daisy[misc->current].clips_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->href) + 3); + strcpy (daisy[misc->current].clips_file, misc->daisy_mp); + strcat (daisy[misc->current].clips_file, "/"); + strcat (daisy[misc->current].clips_file, my_attribute->href); + daisy[misc->current].clips_anchor = strdup (""); + if (strchr (daisy[misc->current].clips_file, '#')) + { + daisy[misc->current].clips_anchor = strdup + (strchr (daisy[misc->current].clips_file, '#') + 1); + *strchr (daisy[misc->current].clips_file, '#') = 0; + } // if + daisy[misc->current].clips_file = + strdup (real_name (misc, daisy[misc->current].clips_file)); + do + { + if (! get_tag_or_label (misc, my_attribute, ncc)) + break; + } while (*misc->label == 0); + get_label_2 (misc, daisy, indent); + misc->current++; + daisy[misc->current].page_number = + daisy[misc->current - 1].page_number; + } // if (strcasecmp (misc->tag, "h1") == 0 || ... + } // while + misc->displaying = misc->current; + parse_smil_2 (misc, my_attribute, daisy); + xmlTextReaderClose (ncc); + xmlFreeDoc (doc); +} // fill_daisy_struct_2 diff --git a/src/daisy3.c b/src/daisy3.c index fff1656..1c19cbd 100644 --- a/src/daisy3.c +++ b/src/daisy3.c @@ -1,5 +1,6 @@ /* daisy3.c - functions to insert daisy3 info into a struct. - * Copyright (C)2015 J. Lemmens + * + * Copyright (C) 2017 J. Lemmens * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -18,871 +19,1262 @@ #include "daisy.h" -void failure (char *str, int e) +void fill_page_numbers (misc_t *misc, daisy_t *daisy, + my_attribute_t *my_attribute) { - endwin (); - beep (); - printf ("\n%s: %s\n\n", str, strerror (e)); - fflush (stdout); - _exit (-1); -} // failure - -daisy_t *create_daisy_struct (misc_t *misc, my_attribute_t *my_attribute) + int i; + htmlDocPtr doc; + xmlTextReaderPtr page; + + for (i = 0; i < misc->total_items; i++) + { + daisy[i].page_number = 0; + if (! (doc = htmlParseFile (daisy[i].xml_file, "UTF-8"))) + failure (misc, daisy[i].xml_file, errno); + if (! (page = xmlReaderWalker (doc))) + failure (misc, daisy[i].xml_file, errno); + + while (1) + { + if (! get_tag_or_label (misc, my_attribute, page)) + break; +#ifdef DAISY_PLAYER + if (*my_attribute->id) + { + if (! *daisy[i].first_id) + strncpy (daisy[i].first_id, my_attribute->id, MAX_STR); + } // if +#endif + if (strcasecmp (misc->tag, "pagenum") == 0 || + strcasecmp (my_attribute->class, "pagenum") == 0) + { + parse_page_number (misc, my_attribute, page); + daisy[i].page_number = misc->current_page_number; + } // if + if (*my_attribute->id) + { + if (strcasecmp (my_attribute->id, daisy[i].anchor) == 0) + { + break; + } // if + } // if + if (i + 1 < misc->total_items) + { + if (*daisy[i + 1].anchor) + { + if (strcasecmp (my_attribute->id, daisy[i + 1].anchor) == 0) + { + break; + } // if + } // if + } // if + } // while + xmlTextReaderClose (page); + xmlFreeDoc (doc); + } // for +} // fill_page_numbers + +void parse_page_number (misc_t *misc, my_attribute_t *my_attribute, + xmlTextReaderPtr page) { - int items; - xmlTextReaderPtr ncx; - xmlDocPtr doc; - char cmd[MAX_CMD], path[MAX_STR]; - FILE *p; - - *misc->daisy_version = *path= 0; - strncpy (cmd, "find -maxdepth 1 -iname \"ncc.html\" -print0", MAX_CMD - 1); - if ((p = popen (cmd, "r")) == NULL) - failure (cmd, errno); - switch (fread (path, MAX_STR - 1, 1, p)) - { - default: - break; - } // switch - if (*path) - strncpy (misc->daisy_version, "2.02", 4); - else + while (1) { - strncpy (cmd, "find -maxdepth 1 -iname \"*.ncx\" -print0", MAX_CMD - 1); - if ((p = popen (cmd, "r")) == NULL) - failure (cmd, errno); - switch (fread (path, MAX_STR - 1, 1, p)) + if (! get_tag_or_label (misc, my_attribute, page)) + return; + if (*misc->label) { - default: - break; - } // switch - if (*path) - strncpy (misc->daisy_version, "3", 2); + misc->current_page_number = atoi (misc->label); + return; + } // if + if (strcasecmp (misc->tag, "/pagenum") == 0) + return; + if (strcasecmp (misc->tag, "text") == 0) + { + char *src, *anchor; + htmlDocPtr doc; + xmlTextReaderPtr text; + + src = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 3); + strcpy (src, misc->daisy_mp); + strcat (src, "/"); + strcat (src, my_attribute->src); + anchor = strdup (""); + if (strchr (src, '#')) + { + anchor = strdup (strchr (src, '#') + 1); + *strchr (src, '#') = 0; + } // if + doc = htmlParseFile (src, "UTF-8"); + if (! (text = xmlReaderWalker (doc))) + failure (misc, src, errno); + + if (*anchor) + { + do + { + if (! get_tag_or_label (misc, my_attribute, text)) + { + xmlTextReaderClose (text); + xmlFreeDoc (doc); + return; + } // if + } while (strcasecmp (my_attribute->id, anchor) != 0); + } // if + + do + { + if (! get_tag_or_label (misc, my_attribute, text)) + { + xmlTextReaderClose (text); + xmlFreeDoc (doc); + return; + } // if + } while (! *misc->label); + xmlTextReaderClose (text); + xmlFreeDoc (doc); + misc->current_page_number = atoi (misc->label); + return; + } // if + } // while +} // parse_page_number + +void fill_xml_anchor_ncx (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ +// first of all fill daisy struct xml_file and anchor + htmlDocPtr doc; + xmlTextReaderPtr ncx; + + misc->total_items = misc->items_in_ncx; + if (! (doc = htmlParseFile (misc->ncx_name, "UTF-8"))) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->ncx_name); + failure (misc, str, e); } // if - pclose (p); - items = 0; - doc = xmlRecoverFile (path); - ncx = xmlReaderWalker (doc); + if (! (ncx = xmlReaderWalker (doc))) + failure (misc, misc->ncx_name, errno); + misc->depth = 0; + misc->current = misc->displaying = 0; while (1) { + daisy[misc->current].xml_file = strdup (""); + daisy[misc->current].anchor = strdup (""); + daisy[misc->current].x = 0; + *daisy[misc->current].label = 0; + daisy[misc->current].page_number = 0; + if (misc->current >= misc->total_items) + break; if (! get_tag_or_label (misc, my_attribute, ncx)) break; - if (strcasestr (misc->daisy_version, "2.02")) - if (strcasecmp (misc->tag, "h1") == 0 || - strcasecmp (misc->tag, "h2") == 0 || - strcasecmp (misc->tag, "h3") == 0 || - strcasecmp (misc->tag, "h4") == 0 || - strcasecmp (misc->tag, "h5") == 0 || - strcasecmp (misc->tag, "h6") == 0) - items++; - if (strcasestr (misc->daisy_version, "3")) - if (strcasecmp (misc->tag, "navPoint") == 0) - items++; + if (strcasecmp (misc->tag, "doctitle") == 0) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, ncx)) + break; + if (strcasecmp (misc->tag, "/doctitle") == 0) + break; + if (*misc->label) + { + strncpy (misc->daisy_title, misc->label, MAX_STR - 1); + break; + } // if + } // while + } // if doctitle + if (strcasecmp (misc->tag, "navpoint") == 0) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, ncx)) + break; + if (strcasecmp (misc->tag, "content") == 0) + { + htmlDocPtr doc; + xmlTextReaderPtr content; + char *src; + + src = strdup (my_attribute->src); + daisy[misc->current].xml_file = + malloc (strlen (misc->daisy_mp) + strlen (src) + 5); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + if (*src) + strcat (daisy[misc->current].xml_file, src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + doc = htmlParseFile (daisy[misc->current].xml_file, "UTF-8"); + if (! (content = xmlReaderWalker (doc))) + { + int e; + char *str; + + e = errno; + str = strdup ((gettext + ("Cannot read %s"), daisy[misc->current].xml_file)); + failure (misc, str, e); + } // if + + if (*daisy[misc->current].anchor) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, content)) + break; + if (*my_attribute->id) + { + if (strcasecmp (my_attribute->id, + daisy[misc->current].anchor) == 0) + { + break; + } // if + } // if + } // while + } // if + while (1) + { + if (! get_tag_or_label (misc, my_attribute, content)) + break; +#ifdef DAISY_PLAYER + if (*my_attribute->id) + { + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, + my_attribute->id, MAX_STR); + } // if +#endif + if (strcasecmp (misc->tag, "text") == 0) + { + daisy[misc->current].xml_file = malloc (strlen + (misc->daisy_mp) + strlen (my_attribute->src) + 5); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, + my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + break; + } // if + } // while + xmlTextReaderClose (content); + xmlFreeDoc (doc); + misc->current++; + break; + } // if (strcasecmp (misc->tag, "content") == 0) + } // while + } // if (strcasecmp (misc->tag, "navpoint") == 0) } // while - xmlTextReaderClose (ncx); - if (doc != NULL) - xmlFreeDoc (doc); - misc->total_items = items; - return (daisy_t *) malloc (items * sizeof (daisy_t)); -} // create_daisy_struct - -float read_time (char *p){ - char *h, *m, *s; - - s = strrchr (p, ':') + 1; - if (s > p) - *(s - 1) = 0; - if (strchr (p, ':')) - { - m = strrchr (p, ':') + 1; - *(m - 1) = 0; - h = p; - } - else - { - h = "0"; - m = p; - } // if - return atoi (h) * 3600 + atoi (m) * 60 + (float) atof (s); -} // read_time + misc->total_items = misc->current; +} // fill_xml_anchor_ncx -void get_clips (misc_t *misc, char *orig_begin, char *end) +void parse_content (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) { - char begin_str[MAX_STR], *begin; - - if (misc->cd_type == CDIO_DISC_MODE_CD_DA) - return; - if (! *orig_begin) - return; - strncpy (begin_str, orig_begin, MAX_STR - 1); - begin = begin_str; - while (! isdigit (*begin)) - begin++; - if (strchr (begin, 's')) - *strchr (begin, 's') = 0; - if (! strchr (begin, ':')) - misc->clip_begin = (float) atof (begin); - else - misc->clip_begin = read_time (begin); - -// fill end - while (! isdigit (*end)) - end++; - if (strchr (end, 's')) - *strchr (end, 's') = 0; - if (! strchr (end, ':')) - misc->clip_end = (float) atof (end); - else - misc->clip_end = read_time (end); -} // get_clips + htmlDocPtr doc; + xmlTextReaderPtr content; -void get_attributes (misc_t *misc, my_attribute_t *my_attribute, - xmlTextReaderPtr reader) -{ - char attr[MAX_STR]; - - snprintf (attr, MAX_STR - 1, "%s", (char *) - xmlTextReaderGetAttribute (reader, BAD_CAST "class")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->class, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) xmlTextReaderGetAttribute - (reader, BAD_CAST "clip-begin")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->clip_begin, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "clipBegin")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->clip_begin, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "clip-end")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->clip_end, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "clipEnd")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->clip_end, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "href")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->href, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "id")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->id, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "idref")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->idref, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "item")); - if (strcmp (attr, "(null)")) - misc->current = atoi (attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "level")); - if (strcmp (attr, "(null)")) - misc->level = atoi ((char *) attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "media-type")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->media_type, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "name")); - if (strcmp (attr, "(null)")) - { - char name[MAX_STR], content[MAX_STR]; - - *name = 0; - snprintf (attr, MAX_STR - 1, "%s", (char *) - xmlTextReaderGetAttribute (reader, BAD_CAST "name")); - if (strcmp (attr, "(null)")) - snprintf (name, MAX_STR - 1, "%s", attr); - *content = 0; - snprintf (attr, MAX_STR - 1, "%s", (char *) - xmlTextReaderGetAttribute (reader, BAD_CAST "content")); - if (strcmp (attr, "(null)")) - snprintf (content, MAX_STR - 1, "%s", attr); - if (strcasestr (name, "dc:format")) - snprintf (misc->daisy_version, MAX_STR - 1, "%s", content); - if (strcasestr (name, "dc:title") && ! *misc->daisy_title) - { - snprintf (misc->daisy_title, MAX_STR - 1, "%s", content); - snprintf (misc->bookmark_title, MAX_STR - 1, "%s", content); - if (strchr (misc->bookmark_title, '/')) - *strchr (misc->bookmark_title, '/') = '-'; - } // if -/* don't use it - if (strcasestr (name, "dtb:depth")) - depth = atoi (content); -*/ - if (strcasestr (name, "dtb:totalPageCount")) - misc->total_pages = atoi (content); - if (strcasestr (name, "ncc:depth")) - misc->depth = atoi (content); - if (strcasestr (name, "ncc:maxPageNormal")) - misc->total_pages = atoi (content); - if (strcasestr (name, "ncc:pageNormal")) - misc->total_pages = atoi (content); - if (strcasestr (name, "ncc:page-normal")) - misc->total_pages = atoi (content); - if (strcasestr (name, "dtb:totalTime") || - strcasestr (name, "ncc:totalTime")) - { - snprintf (misc->ncc_totalTime, MAX_STR - 1, "%s", content); - if (strchr (misc->ncc_totalTime, '.')) - *strchr (misc->ncc_totalTime, '.') = 0; - } // if +#ifdef DAISY_PLAYER + daisy[misc->current].clips_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 5); + strcpy (daisy[misc->current].clips_file, misc->daisy_mp); + strcat (daisy[misc->current].clips_file, "/"); + strcat (daisy[misc->current].clips_file, my_attribute->src); + if (strchr (daisy[misc->current].clips_file, '#')) + { + daisy[misc->current].clips_anchor = + strdup (strchr (daisy[misc->current].clips_file, '#') + 1); + *strchr (daisy[misc->current].clips_file, '#') = 0; } // if - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "playorder")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->playorder, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "phrase")); - if (strcmp (attr, "(null)")) - misc->phrase_nr = atoi ((char *) attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "seconds")); - if (strcmp (attr, "(null)")) - { - misc->elapsed_seconds = atoi (attr); - if (misc->elapsed_seconds < 0) - misc->elapsed_seconds = 0; - if (misc->elapsed_seconds >= misc->total_time) - misc->elapsed_seconds = 0; + daisy[misc->current].clips_file = + strdup (real_name (misc, daisy[misc->current].clips_file)); + if (! (doc = htmlParseFile (daisy[misc->current].clips_file, "UTF-8"))) + failure (misc, daisy[misc->current].clips_file, errno); +#endif +#ifdef EBOOK_SPEAKER + if (! (doc = htmlParseFile (daisy[misc->current].xml_file, "UTF-8"))) + failure (misc, daisy[misc->current].xml_file, errno); +#endif + if (! (content = xmlReaderWalker (doc))) + { + int e; + char *str; + + e = errno; + str = strdup + ((gettext ("Cannot read %s"), daisy[misc->current].xml_file)); + failure (misc, str, e); } // if - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "smilref")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->smilref, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "sound_dev")); - if (strcmp (attr, "(null)")) - snprintf (misc->sound_dev, MAX_STR, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "cd_dev")); - if (strcmp (attr, "(null)")) - snprintf (misc->cd_dev, MAX_STR, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "cddb_flag")); - if (strcmp (attr, "(null)")) - misc->cddb_flag = (char) attr[0]; - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "speed")); - if (strcmp (attr, "(null)")) - misc->speed = atof (attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "src")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->src, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "tts")); - if (strcmp (attr, "(null)")) - misc->tts_no = atof ((char *) attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "toc")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->toc, MAX_STR - 1, "%s", attr); - snprintf (attr, MAX_STR - 1, "%s", (char*) - xmlTextReaderGetAttribute (reader, BAD_CAST "value")); - if (strcmp (attr, "(null)")) - snprintf (my_attribute->value, MAX_STR - 1, "%s", attr); -} // get_attributes - -int get_tag_or_label (misc_t *misc, my_attribute_t *my_attribute, - xmlTextReaderPtr reader) -{ - int type; - - *misc->tag = 0; - *my_attribute->class = *my_attribute->clip_begin = - *my_attribute->clip_end = *my_attribute->href = *my_attribute->id = - *my_attribute->media_type = *my_attribute->playorder = - * my_attribute->smilref = *my_attribute->src = - *my_attribute->toc = *my_attribute->value = 0; - - if (reader == NULL) - return 0; - switch (xmlTextReaderRead (reader)) - { - case -1: - failure ("Can't handle this DTB structure!\n" - "Don't know how to handle it yet, sorry. :-(\n", errno); - case 0: - return 0; - case 1: - break; - } // swwitch - type = xmlTextReaderNodeType (reader); - switch (type) - { - int n, i; - - case -1: - endwin (); - beep (); - printf ("\n"); - printf (gettext ("Cannot read type: %d"), type); - printf ("\n"); - fflush (stdout); - _exit (1); - case XML_READER_TYPE_ELEMENT: - strncpy (misc->tag, (char *) xmlTextReaderConstName (reader), - MAX_TAG - 1); - n = xmlTextReaderAttributeCount (reader); - for (i = 0; i < n; i++) - get_attributes (misc, my_attribute, reader); - return 1; - case XML_READER_TYPE_END_ELEMENT: - snprintf (misc->tag, MAX_TAG - 1, "/%s", - (char *) xmlTextReaderName (reader)); - return 1; - case XML_READER_TYPE_TEXT: - { - int x; - - x = 0; + + if (*daisy[misc->current].anchor) + { +// look for it while (1) { - if (isspace (xmlTextReaderConstValue (reader)[x])) - x++; - else + if (! get_tag_or_label (misc, my_attribute, content)) break; + if (*my_attribute->id) + { + if (strcasecmp (my_attribute->id, + daisy[misc->current].anchor) == 0) + { + break; + } // if + } // if } // while - misc->label_len = - strlen ((char *) xmlTextReaderConstValue (reader)) + x + 10; - misc->label = malloc (misc->label_len); - strncpy (misc->label, (char *) xmlTextReaderConstValue (reader) + x, - misc->label_len - 1); - for (x = strlen (misc->label) - 1; - x >= 0 && isspace (misc->label[x]); x--) - misc->label[x] = 0; - for (x = 0; misc->label[x] > 0; x++) - if (! isascii (misc->label[x])) - misc->label[x] = ' '; - return 1; - } - case XML_READER_TYPE_ENTITY_REFERENCE: - case XML_READER_TYPE_DOCUMENT_TYPE: - case XML_READER_TYPE_SIGNIFICANT_WHITESPACE: - snprintf (misc->tag, MAX_TAG - 1, "/%s", - (char *) xmlTextReaderName (reader)); - return 1; - default: - return 1; - } // switch - return 0; -} // get_tag_or_label - -void parse_text_file (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy, char *text_file) -// page-number -{ - xmlTextReaderPtr textptr; - xmlDocPtr doc; - char *anchor = 0; - - if (strchr (text_file, '#')) - { - anchor = strdup (strchr (text_file, '#') + 1); - *strchr (text_file, '#') = 0; } // if - doc = xmlRecoverFile (text_file); - if (! (textptr = xmlReaderWalker (doc))) - { - endwin (); - beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), text_file); - printf ("\n"); - fflush (stdout); - _exit (1); - } // if - if (anchor) + + while (1) { - do + if (! get_tag_or_label (misc, my_attribute, content)) + break; +#ifdef DAISY_PLAYER + if (*my_attribute->id) + { + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if + if (strcasecmp (misc->tag, "audio") == 0) + break; +#endif +#ifdef EBOOK_SPEAKER + if (strcasecmp (misc->tag, "text") == 0) + { + parse_text (misc, my_attribute, daisy); + break; + } // if +#endif + if (misc->current + 1 < misc->total_items) { - if (! get_tag_or_label (misc, my_attribute, textptr)) + if (*daisy[misc->current + 1].anchor) { - xmlTextReaderClose (textptr); - xmlFreeDoc (doc); - return; + if (strcasecmp (my_attribute->id, + daisy[misc->current + 1].anchor) == 0) + { + break; + } // if } // if - } while (strcasecmp (my_attribute->id, anchor) != 0); + } // if + } // while + xmlTextReaderClose (content); + xmlFreeDoc (doc); +} // parse_content + +void fill_item (misc_t *misc, daisy_t *daisy) +{ + daisy[misc->current].x = daisy[misc->current].level * 3 - 1; + daisy[misc->current].screen = misc->current / misc->max_y; + daisy[misc->current].y = + misc->current - (daisy[misc->current].screen * misc->max_y); +} // fill_item + +void parse_text (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) +{ + htmlDocPtr doc; + xmlTextReaderPtr text; + int remainder; + + doc = htmlParseFile (daisy[misc->current].xml_file, "UTF-8"); + if (! (text = xmlReaderWalker (doc))) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), + daisy[misc->current].xml_file); + failure (misc, str, e); } // if - do + + daisy[misc->current].level = 1; + while (1) { - if (! get_tag_or_label (misc, my_attribute, textptr)) + if (! get_tag_or_label (misc, my_attribute, text)) + break; +#ifdef DAISY_PLAYER + if (*my_attribute->id) { - xmlTextReaderClose (textptr); - xmlFreeDoc (doc); - return; + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if +#endif + if (strcasecmp (misc->tag, "h1") == 0 || + strcasecmp (misc->tag, "h2") == 0 || + strcasecmp (misc->tag, "h3") == 0 || + strcasecmp (misc->tag, "h4") == 0 || + strcasecmp (misc->tag, "h5") == 0 || + strcasecmp (misc->tag, "h6") == 0 || + strcasecmp (misc->tag, "title") == 0 || + strcasecmp (misc->tag, "doctitle") == 0) + { + if (strcasecmp (misc->tag, "title") == 0 || + strcasecmp (misc->tag, "doctitle") == 0) + { + daisy[misc->current].level = 1; + } + else + daisy[misc->current].level = misc->tag[1] - 48; + if (daisy[misc->current].level > misc->depth) + misc->depth = daisy[misc->current].level; + if (! *daisy[misc->current].anchor) + break; } // if - } while (! *misc->label); - daisy[misc->current].page_number = atoi (misc->label); - xmlTextReaderClose (textptr); + if (*daisy[misc->current].anchor && + strcasecmp (my_attribute->id, daisy[misc->current].anchor) == 0) + break; + } // while + + *daisy[misc->current].label = 0; + if (! xmlTextReaderIsEmptyElement (text)) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, text)) + break; + if (strcasecmp (misc->tag, "/h1") == 0 || + strcasecmp (misc->tag, "/h2") == 0 || + strcasecmp (misc->tag, "/h3") == 0 || + strcasecmp (misc->tag, "/h4") == 0 || + strcasecmp (misc->tag, "/h5") == 0 || + strcasecmp (misc->tag, "/h6") == 0 || + strcasecmp (misc->tag, "/title") == 0 || + strcasecmp (misc->tag, "/doctitle") == 0) + { + break; + } // if + if (*misc->label) + { + remainder = 75 - strlen (daisy[misc->current].label); + if (remainder > 0) + { + strncat (daisy[misc->current].label, misc->label, remainder); + strcat (daisy[misc->current].label, " "); + } + else + break; + } // if + } // while + } // ifh + daisy[misc->current].x = daisy[misc->current].level * 3 - 1; + daisy[misc->current].screen = misc->current / misc->max_y; + daisy[misc->current].y = + misc->current - (daisy[misc->current].screen * misc->max_y); +#ifdef EBOOK_SPEAKER + daisy[misc->current].n_phrases = 0; +#endif + xmlTextReaderClose (text); xmlFreeDoc (doc); -} // parse_text_file +} // parse_text -void get_page_number_3 (misc_t *misc, my_attribute_t *my_attribute) +void parse_href (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - xmlDocPtr doc; - xmlTextReaderPtr page; - char *anchor = 0; + htmlDocPtr doc; + xmlTextReaderPtr href; + int remainder; - do - { - if (! get_tag_or_label (misc, my_attribute, misc->reader)) - return; - } while (strcasecmp (misc->tag, "text") != 0); - if (strchr (my_attribute->src, '#')) + if (! (doc = htmlParseFile (daisy[misc->current].xml_file, "UTF-8"))) + failure (misc, daisy[misc->current].xml_file, errno); + if (! (href = xmlReaderWalker (doc))) { - anchor = strdup (strchr (my_attribute->src, '#') + 1); - *strchr (my_attribute->src, '#') = 0; - } // if - doc = xmlRecoverFile (my_attribute->src); - if (! (page = xmlReaderWalker (doc))) - { - endwin (); - beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), my_attribute->src); - printf ("\n"); - fflush (stdout); - _exit (1); + int e; + + e = errno; + snprintf (misc->str, MAX_STR, + gettext ("Cannot read %s"), my_attribute->href); + failure (misc, misc->str, e); } // if - do +\ + daisy[misc->current].level = 1; + while (1) { - if (! get_tag_or_label (misc, my_attribute, page)) + if (! get_tag_or_label (misc, my_attribute, href)) + break; +#ifdef DAISY_PLAYER + if (*my_attribute->id) { - xmlTextReaderClose (page); - xmlFreeDoc (doc); - return; + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); } // if - } while (strcasecmp (my_attribute->id, anchor) != 0); - do - { - if (! get_tag_or_label (misc, my_attribute, page)) +#endif + if (strcasecmp (misc->tag, "text") == 0) { - xmlTextReaderClose (page); + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 1); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + parse_text (misc, my_attribute, daisy); + xmlTextReaderClose (href); xmlFreeDoc (doc); return; } // if - } while (! *misc->label); - xmlTextReaderClose (page); - xmlFreeDoc (doc); - misc->current_page_number = atoi (misc->label); -} // get_page_number_3 -void parse_smil_3 (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy) -{ - int x; - xmlTextReaderPtr parse; - xmlDocPtr doc; - - misc->total_time = 0; - for (x = 0; x < misc->total_items; x++) - { - if (*daisy[x].smil_file == 0) - continue; - doc = xmlRecoverFile (daisy[x].smil_file); - if (! (parse = xmlReaderWalker (doc))) - { - endwin (); - beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), daisy[x].smil_file); - printf ("\n"); - fflush (stdout); - _exit (1); +// some EPUB use this + if (strcasecmp (misc->tag, "i") == 0) + { + xmlTextReaderClose (href); + xmlFreeDoc (doc); + return; } // if -// parse this smil - while (1) - { - if (! get_tag_or_label (misc, my_attribute, parse)) - break; - if (strcasecmp (daisy[x].anchor, my_attribute->id) == 0) - break; - } // while - daisy[x].duration = 0; - while (1) +// or + if (strcasecmp (misc->tag, "title") == 0 || + strcasecmp (misc->tag, "h1") == 0 || + strcasecmp (misc->tag, "h2") == 0 || + strcasecmp (misc->tag, "h3") == 0 || + strcasecmp (misc->tag, "h4") == 0 || + strcasecmp (misc->tag, "h5") == 0 || + strcasecmp (misc->tag, "h6") == 0) { - if (! get_tag_or_label (misc, my_attribute, parse)) - break; -// get misc->clip_begin - if (strcasecmp (misc->tag, "audio") == 0) + if (strcasecmp (misc->tag, "title") == 0) + daisy[misc->current].level = 1; + else + daisy[misc->current].level = misc->tag[1] - 48; + *daisy[misc->current].label = 0; + while (1) { - get_clips (misc, my_attribute->clip_begin, - my_attribute->clip_end); - daisy[x].begin = misc->clip_begin; - daisy[x].duration += misc->clip_end - misc->clip_begin; -// get clip_end - while (1) + if (! get_tag_or_label (misc, my_attribute, href)) + break; + if (strcasecmp (misc->tag, "/h1") == 0 || + strcasecmp (misc->tag, "/h2") == 0 || + strcasecmp (misc->tag, "/h3") == 0 || + strcasecmp (misc->tag, "/h4") == 0 || + strcasecmp (misc->tag, "/h5") == 0 || + strcasecmp (misc->tag, "/h6") == 0 || + strcasecmp (misc->tag, "/title") == 0 || + strcasecmp (misc->tag, "/doctitle") == 0) { - if (! get_tag_or_label (misc, my_attribute, parse)) - break; - if (*daisy[x + 1].anchor) - if (strcasecmp (my_attribute->id, daisy[x + 1].anchor) == 0) - break; - if (strcasecmp (misc->tag, "audio") == 0) + break; + } // if + *daisy[misc->current].label = 0; + if (*misc->label) + { + remainder = 75 - strlen (daisy[misc->current].label); + if (remainder > 0) { - get_clips (misc, my_attribute->clip_begin, my_attribute->clip_end); - daisy[x].duration += misc->clip_end - misc->clip_begin; - } // IF - } // while - if (*daisy[x + 1].anchor) - if (strcasecmp (my_attribute->id, daisy[x + 1].anchor) == 0) + strncat (daisy[misc->current].label, misc->label,remainder); + strcat (daisy[misc->current].label, " "); + } + else break; - } // if (strcasecmp (misc->tag, "audio") == 0) - } // while - misc->total_time += daisy[x].duration; - xmlTextReaderClose (parse); - xmlFreeDoc (doc); - } // for -} // parse_smil_3 + } // if + } // while + fill_item (misc, daisy); + xmlTextReaderClose (href); + xmlFreeDoc (doc); + return; + } // if (strcasecmp (misc->tag, "h1") == 0 || + +// others use this + if (strcasecmp (my_attribute->class, "h1") == 0 || + strcasecmp (my_attribute->class, "h2") == 0 || + strcasecmp (my_attribute->class, "h3") == 0 || + strcasecmp (my_attribute->class, "h4") == 0 || + strcasecmp (my_attribute->class, "h5") == 0 || + strcasecmp (my_attribute->class, "h6") == 0) + { + while (1) + { + if (! get_tag_or_label (misc, my_attribute, href)) + break; + if (strcasecmp (misc->tag, "text") == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 1); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + xmlTextReaderClose (href); + xmlFreeDoc (doc); + return; + } // if + } // while + xmlTextReaderClose (href); + xmlFreeDoc (doc); + return; + } // if (strcasecmp (my_attribute->class, "h1") == 0 || + } // while + xmlTextReaderClose (href); + xmlFreeDoc (doc); +} // parse_href -void parse_content (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy, char *src) +void parse_manifest (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) { - int found_anchor, found_text; - char text_file[MAX_STR]; - xmlTextReaderPtr content; + xmlTextReaderPtr manifest; + htmlDocPtr doc; + char *idref; - strncpy (daisy[misc->current].smil_file, src, MAX_STR - 1); - if (strchr (daisy[misc->current].smil_file, '#')) + idref = strdup (my_attribute->idref); + if (! (doc = htmlParseFile (misc->opf_name, "UTF-8"))) + failure (misc, misc->opf_name, errno); + if (! (manifest = xmlReaderWalker (doc))) { - strncpy (daisy[misc->current].anchor, - strchr (daisy[misc->current].smil_file, '#') + 1, MAX_STR - 1); - *strchr (daisy[misc->current].smil_file, '#') = 0; + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->opf_name); + failure (misc, str, e); } // if - xmlDocPtr doc = xmlRecoverFile (daisy[misc->current].smil_file); - if (! (content = xmlReaderWalker (doc))) + daisy[misc->current].x = 0; + while (1) + { + if (! get_tag_or_label (misc, my_attribute, manifest)) + break; + if (strcasecmp (my_attribute->id, idref) == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->href) + 5); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->href); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + parse_href (misc, my_attribute, daisy); +#ifdef DAISY_PLAYER + daisy[misc->current].clips_file = + strdup (daisy[misc->current].xml_file); + daisy[misc->current].clips_anchor = + strdup (daisy[misc->current].anchor); + parse_smil_3 (misc, my_attribute, daisy); +#endif + if (daisy[misc->current].level > misc->depth) + misc->depth = daisy[misc->current].level; + misc->current++; + daisy[misc->current].level = 1; + daisy[misc->current].x = 0; + break; + } // if + } // while + xmlTextReaderClose (manifest); + xmlFreeDoc (doc); +} // parse_manifest + +#ifdef DAISY_PLAYER +void parse_clips (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ + xmlTextReaderPtr parse; + htmlDocPtr doc; + + doc = htmlParseFile (daisy[misc->current].xml_file, "UTF-8"); + if (! (parse = xmlReaderWalker (doc))) { endwin (); beep (); printf ("\n"); - printf (gettext ("Cannot read %s"), daisy[misc->current].smil_file); + printf (gettext ("Cannot read %s"), daisy[misc->current].xml_file); printf ("\n"); fflush (stdout); _exit (1); } // if - found_anchor = found_text = 0; + +// parse this smil while (1) { - if (! get_tag_or_label (misc, my_attribute, content)) + if (! get_tag_or_label (misc, my_attribute, parse)) + break; + if (*my_attribute->id) { - xmlTextReaderClose (content); - xmlFreeDoc (doc); - return; + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); } // if - if (strcasecmp (misc->tag, "text") == 0) + if (strcasecmp (daisy[misc->current].anchor, my_attribute->id) == 0) { - found_text = 1; - strncpy (text_file, my_attribute->src, MAX_STR - 1); + break; } // if - if (*daisy[misc->current].anchor && - strcasecmp (my_attribute->id, daisy[misc->current].anchor) == 0) - found_anchor = 1; - if (found_anchor && found_text) + } // while + daisy[misc->current].duration = 0; + while (1) + { + if (! get_tag_or_label (misc, my_attribute, parse)) break; +// get misc->clip_begin + if (strcasecmp (misc->tag, "audio") == 0) + { + get_clips (misc, my_attribute); + daisy[misc->current].begin = misc->clip_begin; + daisy[misc->current].duration += misc->clip_end - misc->clip_begin; + } // if } // while - parse_text_file (misc, my_attribute, daisy, text_file); - xmlTextReaderClose (content); + +// get clip_end + while (1) + { + if (! get_tag_or_label (misc, my_attribute, parse)) + break; + if (misc->current + 1 < misc->total_items && + *daisy[misc->current + 1].anchor) + { + if (strcasecmp (my_attribute->id, + daisy[misc->current + 1].anchor) == 0) + break; + } // if + if (strcasecmp (misc->tag, "audio") == 0) + { + get_clips (misc, my_attribute); + daisy[misc->current].duration += misc->clip_end - misc->clip_begin; + } // IF + if (misc->current + 1 < misc->total_items && + *daisy[misc->current + 1].anchor) + { + if (strcasecmp (my_attribute->id, daisy[misc->current + 1].anchor) == 0) + { + break; + } // if + } // if + } // while + misc->total_time += daisy[misc->current].duration; + xmlTextReaderClose (parse); xmlFreeDoc (doc); -} // parse_content +} // parse_clips +#endif -void parse_xml (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy, char *name) +#ifdef DAISY_PLAYER +void parse_smil_3 (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) { - xmlTextReaderPtr xml; - int indent = 0; - char xml_name[MAX_STR]; + xmlTextReaderPtr smil; + htmlDocPtr doc; - strncpy (xml_name, name, MAX_STR - 1); - xmlDocPtr doc = xmlRecoverFile (misc->ncx_name); - if (! (xml = xmlReaderWalker (doc))) + daisy[misc->current].clips_file = + malloc (strlen (misc->daisy_mp) + strlen (my_attribute->href) + 5); + strcpy (daisy[misc->current].clips_file, misc->daisy_mp); + strcat (daisy[misc->current].clips_file, "/"); + strcat (daisy[misc->current].clips_file, my_attribute->href); + daisy[misc->current].clips_file = + strdup (real_name (misc, daisy[misc->current].clips_file)); + if (! (doc = htmlParseFile (daisy[misc->current].clips_file, "UTF-8"))) + failure (misc, daisy[misc->current].clips_file, errno); + if (! (smil = xmlReaderWalker (doc))) { - endwin (); - beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), misc->ncx_name); - printf ("\n"); - fflush (stdout); - _exit (1); + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, + gettext ("Cannot read %s"), daisy[misc->current].clips_file); + failure (misc, str, e); } // if - misc->total_pages = misc->depth = 0; + daisy[misc->current].level = misc->depth = 1; while (1) { -// get dtb:totalPageCount - if (! get_tag_or_label (misc, my_attribute, xml)) + if (! get_tag_or_label (misc, my_attribute, smil)) + break; + if (*my_attribute->id) + { + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if + if (strcasecmp (misc->tag, "text") == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 1); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + } // if + if (! *daisy[misc->current].first_id) + { + if (*my_attribute->id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if + if (strcasecmp (misc->tag, "audio") == 0) + { + parse_clips (misc, my_attribute, daisy); + } // if + misc->current++; + if (misc->current >= misc->total_items) + { break; + } // if } // while - xmlTextReaderClose (xml); + xmlTextReaderClose (smil); xmlFreeDoc (doc); +} // parse_smil_3 +#endif + +void fill_xml_anchor_opf (misc_t *misc, my_attribute_t *my_attribute, + daisy_t *daisy) +{ +// first of all fill daisy struct xml_file and anchor + htmlDocPtr doc; + xmlTextReaderPtr opf; - doc = xmlRecoverFile (xml_name); - if (! (xml = xmlReaderWalker (doc))) + if (! (doc = htmlParseFile (misc->opf_name, "UTF-8"))) { - endwin (); + int e; + char str[MAX_STR + 1]; + + e = errno; beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), xml_name); - printf ("\n"); - fflush (stdout); - _exit (1); + snprintf (str, MAX_STR, "fill_xml_anchor_opf %s", misc->opf_name); + failure (misc, str, e); + } // if + if ((opf = xmlReaderWalker (doc)) == NULL) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->opf_name); + failure (misc, str, e); } // if + + misc->depth = 0; misc->current = 0; while (1) { - if (! get_tag_or_label (misc, my_attribute, xml)) + daisy[misc->current].xml_file = strdup (""); + daisy[misc->current].anchor = strdup (""); + daisy[misc->current].x = 0; + *daisy[misc->current].label = 0; + daisy[misc->current].page_number = 0; + if (! get_tag_or_label (misc, my_attribute, opf)) break; - if (strcasecmp (misc->tag, "pagenum") == 0) +#ifdef EBOOK_SPEAKER + if (strcasecmp (misc->tag, "itemref") == 0) { - do + htmlDocPtr doc; + xmlTextReaderPtr ptr; + char *idref; + + idref = strdup (my_attribute->idref); + if (! (doc = htmlParseFile (misc->opf_name, "UTF-8"))) + failure (misc, misc->opf_name, errno); + if (! (ptr = xmlReaderWalker (doc))) + failure (misc, misc->opf_name, errno); + while (1) { - if (! get_tag_or_label (misc, my_attribute, xml)) + if (! get_tag_or_label (misc, my_attribute, ptr)) break; - } while (! *misc->label); - daisy[misc->current].page_number = atoi (misc->label); - } // if pagenum - if (strcasecmp (misc->tag, "h1") == 0 || - strcasecmp (misc->tag, "h2") == 0 || - strcasecmp (misc->tag, "h3") == 0 || - strcasecmp (misc->tag, "h4") == 0 || - strcasecmp (misc->tag, "h5") == 0 || - strcasecmp (misc->tag, "h6") == 0) + if (strcasecmp (my_attribute->id, idref) == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->href) + 5); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->href); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); +// if it is a smil + { + htmlDocPtr doc; + xmlTextReaderPtr smil; + + if (! (doc = htmlParseFile (daisy[misc->current].xml_file, + "UTF-8"))) + failure (misc, daisy[misc->current].xml_file, errno); + if ((smil = xmlReaderWalker (doc)) == NULL) + failure (misc, daisy[misc->current].xml_file, errno); + while (1) + { + if (! get_tag_or_label (misc, my_attribute, smil)) + break; +#ifdef DAISY_PLAYER + if (*my_attribute->id) + { + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, + my_attribute->id, MAX_STR); + } // if +#endif + if (strcasecmp (misc->tag, "text") == 0) + { + daisy[misc->current].xml_file = malloc (strlen + (misc->daisy_mp) + strlen (my_attribute->src) + 5); + strcpy (daisy[misc->current].xml_file, + misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, + my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = strdup + (real_name (misc, daisy[misc->current].xml_file)); + break; + } // if + } // while + xmlTextReaderClose (smil); + xmlFreeDoc (doc); + } // if it is a smil + parse_text (misc, my_attribute, daisy); + break; + } // if + } // while + xmlTextReaderClose (ptr); + xmlFreeDoc (doc); + misc->current++; + if (misc->current >= misc->total_items) + break; + } // if itemref +#endif +#ifdef DAISY_PLAYER + if (strcasestr (my_attribute->media_type, "application/smil")) { - int l; + htmlDocPtr doc; + xmlTextReaderPtr smil; - l = misc->tag[1] - '0'; - if (l > misc->depth) - misc->depth = l; - daisy[misc->current].level = l; - daisy[misc->current].x = l + 3 - 1; - indent = daisy[misc->current].x = (l - 1) * 3 + 1; - if (! *my_attribute->smilref) - continue; - strncpy (daisy[misc->current].smil_file, - xml_name, MAX_STR - 1); - if (strchr (my_attribute->smilref, '#')) + daisy[misc->current].clips_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->href) + 5); + strcpy (daisy[misc->current].clips_file, misc->daisy_mp); + strcat (daisy[misc->current].clips_file, "/"); + strcat (daisy[misc->current].clips_file, my_attribute->href); + daisy[misc->current].clips_anchor = strdup (""); + if (strchr (daisy[misc->current].clips_file, '#')) { - strncpy (daisy[misc->current].anchor, - strchr (my_attribute->smilref, '#') + 1, - MAX_STR - 1); + daisy[misc->current].clips_anchor = strdup + (strchr (daisy[misc->current].clips_file, '#') + 1); + *strchr (daisy[misc->current].clips_file, '#') = 0; } // if - do + daisy[misc->current].clips_file = + strdup(real_name (misc, daisy[misc->current].clips_file)); + if (! (doc = htmlParseFile (daisy[misc->current].clips_file, + "UTF-8"))) + failure (misc, daisy[misc->current].clips_file, errno); + if ((smil = xmlReaderWalker (doc)) == NULL) + failure (misc, daisy[misc->current].clips_file, errno); + while (1) { - if (! get_tag_or_label (misc, my_attribute, xml)) + if (! get_tag_or_label (misc, my_attribute, smil)) break; - } while (*misc->label == 0); - get_label (misc, daisy, indent); + if (*my_attribute->id) + { + if (! *daisy[misc->current].first_id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if + if (strcasecmp (misc->tag, "text") == 0) + { + daisy[misc->current].xml_file = malloc + (strlen (misc->daisy_mp) + strlen (my_attribute->src) + 5); + strcpy (daisy[misc->current].xml_file, misc->daisy_mp); + strcat (daisy[misc->current].xml_file, "/"); + strcat (daisy[misc->current].xml_file, my_attribute->src); + daisy[misc->current].anchor = strdup (""); + if (strchr (daisy[misc->current].xml_file, '#')) + { + daisy[misc->current].anchor = strdup + (strchr (daisy[misc->current].xml_file, '#') + 1); + *strchr (daisy[misc->current].xml_file, '#') = 0; + } // if + daisy[misc->current].xml_file = + strdup (real_name (misc, daisy[misc->current].xml_file)); + parse_text (misc, my_attribute, daisy); + break; + } // if + } // while + xmlTextReaderClose (smil); + xmlFreeDoc (doc); misc->current++; - misc->displaying++; - } // if (strcasecmp (misc->tag, "h1") == 0 || ... + if (misc->current >= misc->total_items) + break; + } // if +#endif } // while - xmlTextReaderClose (xml); - xmlFreeDoc (doc); -} // parse_xml + xmlTextReaderClose (opf); + misc->total_items = misc->current; +#ifdef DAISY_PLAYER + if (misc->total_items == 0) + { + beep (); + quit_daisy_player (misc, daisy); + printf ("%s\n", gettext ( + "This book has no audio. Play this book with eBook-speaker")); + _exit (0); + } // if +#endif +} // fill_xml_anchor_opf -void parse_manifest (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy, char *name, char *id_ptr) +void parse_opf (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - xmlTextReaderPtr manifest; - char *id, *toc; + int i; + htmlDocPtr doc; + xmlTextReaderPtr opf; - id = strdup (id_ptr); - if (! *id) + if (misc->items_in_opf == 0) { - free (id); - return; + endwin (); + beep (); + printf ("%s\n", gettext ("No items found. Try option \"-N\".")); + exit (0); } // if - toc = strdup (my_attribute->toc); - xmlDocPtr doc = xmlRecoverFile (name); - if (! (manifest = xmlReaderWalker (doc))) + + misc->total_items = misc->items_in_opf; + if (misc->total_items == 0) + misc->total_items = 1; +#ifdef DAISY_PLAYER + for (i = 0; i < misc->total_items; i++) + *daisy[i].first_id = 0; +#endif + misc->daisy_mp = strdup (misc->opf_name); + misc->daisy_mp = dirname (misc->daisy_mp); + fill_xml_anchor_opf (misc, my_attribute, daisy); + if (! (doc = htmlParseFile (misc->opf_name, "UTF-8"))) { - endwin (); + int e; + char str[MAX_STR + 1]; + + e = errno; beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), name); - printf ("\n"); - fflush (stdout); - _exit (1); + snprintf (str, MAX_STR, "parse_opf: %s", misc->opf_name); + failure (misc, str, e); } // if - do + if ((opf = xmlReaderWalker (doc)) == NULL) { - if (! get_tag_or_label (misc, my_attribute, manifest)) + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->opf_name); + failure (misc, str, e); + } // if +#ifdef DAISY_PLAYER + misc->total_time = 0; +#endif + misc->current = misc->displaying = 0; + while (1) + { + if (! get_tag_or_label (misc, my_attribute, opf)) break; - if (strcasecmp (misc->tag, "dc:language") == 0 && ! *misc->daisy_language) + if (strcasecmp (misc->tag, "language") == 0) { + if (xmlTextReaderIsEmptyElement (opf)) + continue; do { - if (! get_tag_or_label (misc, my_attribute, manifest)) - break; - if (*misc->label) + if (! get_tag_or_label (misc, my_attribute, opf)) break; - } while (strcasecmp (misc->tag, "/dc:language") != 0); + } while (! *misc->label); strncpy (misc->daisy_language, misc->label, MAX_STR - 1); - } // if dc:language - if (strcasecmp (misc->tag, "dc:title") == 0 && ! *misc->daisy_title) + } // if language + if (strcasecmp (misc->tag, "totalTime") == 0) + { + if (xmlTextReaderIsEmptyElement (opf)) + continue; + do + { + if (! get_tag_or_label (misc, my_attribute, opf)) + break; + } while (! *misc->label); + strncpy (misc->ncc_totalTime, misc->label, MAX_STR - 1); + } // if (strcasestr (misc->tag, "totalTime") == 0) + if (strcasecmp (misc->tag, "Title") == 0) { + if (xmlTextReaderIsEmptyElement (opf)) + continue; do { - if (! get_tag_or_label (misc, my_attribute, manifest)) + if (! get_tag_or_label (misc, my_attribute, opf)) break; if (*misc->label) + { + snprintf (misc->daisy_title, 75, "%s", misc->label); + snprintf (misc->bookmark_title, MAX_STR - 1, + "%s", misc->label); + if (strchr (misc->bookmark_title, '/')) + *strchr (misc->bookmark_title, '/') = '-'; break; - } while (strcasecmp (misc->tag, "/dc:title") != 0); - strncpy (misc->daisy_title, misc->label, MAX_STR - 1); - strncpy (misc->bookmark_title, misc->label, MAX_STR - 1); - if (strchr (misc->bookmark_title, '/')) - *strchr (misc->bookmark_title, '/') = '-'; - } // if dc:title - } while (strcasecmp (misc->tag, "manifest") != 0); - while (1) - { - if (! get_tag_or_label (misc, my_attribute, manifest)) - break; - if (*toc && strcasecmp (my_attribute->id, id) == 0) - { - parse_ncx (misc, my_attribute, daisy, my_attribute->href); - xmlTextReaderClose (manifest); - xmlFreeDoc (doc); - return; - } // if toc - if (*id && strcasecmp (my_attribute->id, id) == 0) + } // if + } while (strcasestr (misc->tag, "/title") != 0); + } // if title + +/* do not use + if (strcasecmp (misc->tag, "spine") == 0) { - strncpy (daisy[misc->current].smil_file, my_attribute->href, - MAX_STR - 1); - snprintf (daisy[misc->current].label, 80, "%d", misc->current + 1); - daisy[misc->current].screen = misc->current / misc->max_y; - daisy[misc->current].y = - misc->current - (daisy[misc->current].screen * misc->max_y); - daisy[misc->current].x = 1; - misc->current++; - } // if (strcasecmp (my_attribute->id, id) == 0) + while (1) + { + if (! get_tag_or_label (misc, my_attribute, opf)) + break; + if (strcasecmp (misc->tag, "itemref") == 0) + parse_manifest (misc, my_attribute, daisy); + } // while + } // if spine +*/ + } // while - xmlTextReaderClose (manifest); + xmlTextReaderClose (opf); xmlFreeDoc (doc); -} // parse_manifest + misc->items_in_opf = misc->total_items; + + for (i = 0; i < misc->items_in_opf; i++) + { +#ifdef EBOOK_SPEAKER + daisy[i].orig_smil = strdup (daisy[i].xml_file); + *daisy[i].class = 0; +#endif + } //for +} // parse_opf void read_daisy_3 (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - char cmd[MAX_CMD], path[MAX_STR]; - FILE *r; - int ret; +// when OPF or NCX is forced + if (misc->use_OPF) + parse_opf (misc, my_attribute, daisy); + else + if (misc->use_NCX) + parse_ncx (misc, my_attribute, daisy); - snprintf (cmd, MAX_CMD - 1, "find -iname \"*.ncx\" -print0"); - *path = 0; - r = popen (cmd, "r"); - ret = fread (path, MAX_STR - 1, 1, r); - pclose (r); - if (*path == 0) +// else do + else { - endwin (); - printf ("\n"); - printf (gettext ("No DAISY-CD or Audio-cd found")); - printf ("\n"); - beep (); - fflush (stdout); - usage (PACKAGE); + if (misc->items_in_opf > misc->items_in_ncx) + parse_opf (misc, my_attribute, daisy); + else + parse_ncx (misc, my_attribute, daisy); } // if - strncpy (misc->ncx_name, basename (path), MAX_STR - 1); - strncpy (misc->NCC_HTML, misc->ncx_name, MAX_STR - 1); - snprintf (misc->daisy_mp, MAX_STR - 1, "%s/%s", - get_current_dir_name (), dirname (path)); - ret = chdir (misc->daisy_mp); - snprintf (cmd, MAX_CMD - 1, "find -iname \"*.opf\" -print0"); - r = popen (cmd, "r"); - ret = fread (path, MAX_STR - 1, 1, r); - pclose (r); - ret = ret; // discard compiler warning - strncpy (misc->opf_name, basename (path), MAX_STR - 1); - parse_ncx (misc, my_attribute, daisy, misc->ncx_name); - misc->total_items = misc->current; - parse_smil_3 (misc, my_attribute, daisy); - misc->total_items = misc->current; } // read_daisy_3 -void get_label (misc_t *misc, daisy_t *daisy, int indent) +void parse_ncx (misc_t *misc, my_attribute_t *my_attribute, daisy_t *daisy) { - strncpy (daisy[misc->current].label, misc->label, 80); - daisy[misc->current].label[64 - daisy[misc->current].x] = 0; - if (misc->displaying == misc->max_y) - misc->displaying = 1; - if (strcasecmp (daisy[misc->current].class, "pagenum") == 0) - daisy[misc->current].x = 0; - else - if (daisy[misc->current].x == 0) - daisy[misc->current].x = indent + 3; - daisy[misc->current].screen = misc->current / misc->max_y; - daisy[misc->current].y = - misc->current - daisy[misc->current].screen * misc->max_y; -} // get_label - -void parse_ncx (misc_t *misc, my_attribute_t *my_attribute, - daisy_t *daisy, char *name) -{ - int indent, found_page = 0; + htmlDocPtr doc; xmlTextReaderPtr ncx; - xmlDocPtr doc; + int i; - doc = xmlRecoverFile (name); - if (! (ncx = xmlReaderWalker (doc))) + if (misc->items_in_ncx == 0) { endwin (); beep (); - printf ("\n"); - printf (gettext ("Cannot read %s"), name); - printf ("\n"); - fflush (stdout); - _exit (1); + printf ("%s\n", gettext ("No items found. Try option \"-O\".")); + exit (0); + } // if + + misc->total_items = misc->items_in_ncx; + if (misc->total_items == 0) + misc->total_items = 1; + misc->daisy_mp = strdup (misc->ncx_name); + misc->daisy_mp = dirname (misc->daisy_mp); +#ifdef DAISY_PLAYER + for (i = 0; i < misc->items_in_ncx; i++) + *daisy[i].first_id = 0; +#endif + fill_xml_anchor_ncx (misc, my_attribute, daisy); + if (! (doc = htmlParseFile (misc->ncx_name, "UTF-8"))) + { + int e; + char str[MAX_STR]; + + e = errno; + snprintf (str, MAX_STR, gettext ("Cannot read %s"), misc->ncx_name); + failure (misc, str, e); } // if - misc->current = misc->displaying = misc->level = misc->depth = 0; + ncx = xmlReaderWalker (doc); + misc->current = misc->displaying = 0; + misc->level = misc->depth = 0; + daisy[misc->current].x = 0; while (1) { + if (misc->current >= misc->total_items) + break; if (! get_tag_or_label (misc, my_attribute, ncx)) break; - if (strcasecmp (misc->tag, "docTitle") == 0) +#ifdef DAISY_PLAYER + if (! *daisy[misc->current].first_id) { - do - { - if (! get_tag_or_label (misc, my_attribute, ncx)) - break; - } while (! *misc->label); - strncpy (misc->daisy_title, misc->label, MAX_STR - 1); - strncpy (misc->bookmark_title, misc->label, MAX_STR - 1); - if (strchr (misc->bookmark_title, '/')) - *strchr (misc->bookmark_title, '/') = '-'; - } // if (strcasecmp (misc->tag, "docTitle") == 0) + if (*my_attribute->id) + strncpy (daisy[misc->current].first_id, my_attribute->id, + MAX_STR); + } // if +#endif if (strcasecmp (misc->tag, "docAuthor") == 0) { + if (xmlTextReaderIsEmptyElement (ncx)) + continue; do { if (! get_tag_or_label (misc, my_attribute, ncx)) break; } while (strcasecmp (misc->tag, "/docAuthor") != 0); } // if (strcasecmp (misc->tag, "docAuthor") == 0) - if (strcasecmp (misc->tag, "navPoint") == 0) + if (strcasecmp (misc->tag, "navpoint") == 0) { misc->level++; if (misc->level > misc->depth) misc->depth = misc->level; - daisy[misc->current].page_number = 0; - daisy[misc->current].playorder = atoi (my_attribute->playorder); - daisy[misc->current].level = misc->level; - if (daisy[misc->current].level < 1) - daisy[misc->current].level = 1; - daisy[misc->current].x = misc->level + 2; - indent = (misc->level - 1) * 3 + 1; - strncpy (daisy[misc->current].class, my_attribute->class, MAX_STR - 1); +#ifdef EBOOK_SPEAKER + strncpy (daisy[misc->current].my_class, my_attribute->my_class, + MAX_STR - 1); +#endif while (1) { if (! get_tag_or_label (misc, my_attribute, ncx)) break; if (strcasecmp (misc->tag, "text") == 0) { + *daisy[misc->current].label = 0; + if (xmlTextReaderIsEmptyElement (ncx)) + continue; while (1) { if (! get_tag_or_label (misc, my_attribute, ncx)) @@ -891,36 +1283,35 @@ void parse_ncx (misc_t *misc, my_attribute_t *my_attribute, break; if (*misc->label) { - get_label (misc, daisy, indent); + strncpy (daisy[misc->current].label, misc->label, + 75 - strlen (daisy[misc->current].label)); break; } // if } // while - } // if (strcasecmp (misc->tag, "text") == 0) + } // if (strcasecmp (misc->tag, "text") == 0) if (strcasecmp (misc->tag, "content") == 0) { - if (*my_attribute->src) - { - parse_content (misc, my_attribute, daisy, my_attribute->src); - misc->current++; - } // if + parse_content (misc, my_attribute, daisy); + daisy[misc->current].level = misc->level; + fill_item (misc, daisy); + misc->current++; + daisy[misc->current].x = 0; break; } // if (strcasecmp (misc->tag, "content") == 0) } // while - } // if (strcasecmp (misc->tag, "navPoint") == 0) + } // if (strcasecmp (misc->tag, "navpoint") == 0) if (strcasecmp (misc->tag, "/navpoint") == 0) misc->level--; - if (strcasecmp (misc->tag, "page") == 0 || found_page) - { - found_page = 0; - strncpy (daisy[++misc->current].label, my_attribute->number, 80); - strncpy (daisy[misc->current].smil_file, name, MAX_STR - 1); - daisy[misc->current].screen = misc->current / misc->max_y; - daisy[misc->current].y = - misc->current - (daisy[misc->current].screen * misc->max_y); - daisy[misc->current].x = 2; - } // if (strcasecmp (misc->tag, "page") == 0) } // while xmlTextReaderClose (ncx); xmlFreeDoc (doc); misc->total_items = misc->current; + + for (i = 0; i < misc->items_in_ncx; i++) + { +#ifdef EBOOK_SPEAKER + daisy[i].orig_smil = strdup (daisy[i].xml_file); + *daisy[i].class = 0; +#endif + } //for } // parse_ncx diff --git a/src/gettext.h b/src/gettext.h index ac4d7d5..841b072 100644 --- a/src/gettext.h +++ b/src/gettext.h @@ -1,5 +1,6 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software + Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -224,15 +225,17 @@ dcpgettext_expr (const char *domain, if (msg_ctxt_id != NULL) #endif { + int found_translation; memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); translation = dcgettext (domain, msg_ctxt_id, category); + found_translation = (translation != msg_ctxt_id); #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS if (msg_ctxt_id != buf) free (msg_ctxt_id); #endif - if (translation != msg_ctxt_id) + if (found_translation) return translation; } return msgid; @@ -270,15 +273,17 @@ dcnpgettext_expr (const char *domain, if (msg_ctxt_id != NULL) #endif { + int found_translation; memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); msg_ctxt_id[msgctxt_len - 1] = '\004'; memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); + found_translation = !(translation == msg_ctxt_id || translation == msgid_plural); #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS if (msg_ctxt_id != buf) free (msg_ctxt_id); #endif - if (!(translation == msg_ctxt_id || translation == msgid_plural)) + if (found_translation) return translation; } return (n == 1 ? msgid : msgid_plural); diff --git a/src/paranoia.c b/src/paranoia.c index 3d306b5..85a67af 100644 --- a/src/paranoia.c +++ b/src/paranoia.c @@ -65,25 +65,25 @@ pid_t play_track (misc_t *misc, char *out_file, char *type, { cdio_paranoia_free (misc->par); init_paranoia (misc); - switch (misc->player_pid = fork ()) + switch (misc->cdda_pid = fork ()) { case 0: /* Child reads from pipe */ { - char path[MAX_STR + 1], str[MAX_STR + 1]; + char path[MAX_STR + 1]; close (misc->pipefd[1]); /* don't need this in child */ #ifdef F_SETPIPE_SZ fcntl (misc->pipefd[0], F_SETPIPE_SZ, 1024000); #endif snprintf (path, MAX_STR, "/dev/fd/%d", misc->pipefd[0]); - snprintf (str, MAX_STR, "%f", misc->speed); - playfile (misc, path, "cdda", out_file, type, str); + snprintf (misc->str, MAX_STR, "%f", misc->speed); + playfile (misc, path, "cdda", out_file, type, misc->str); close (misc->pipefd[0]); _exit (0); } default: paranoia_seek (misc->par, from, SEEK_SET); misc->lsn_cursor = from; - return misc->player_pid; + return misc->cdda_pid; } // switch -} // play_track +} // play_track diff --git a/texinfo.tex b/texinfo.tex new file mode 100644 index 0000000..85f184c --- /dev/null +++ b/texinfo.tex @@ -0,0 +1,10079 @@ +% texinfo.tex -- TeX macros to handle Texinfo files. +% +% Load plain if necessary, i.e., if running under initex. +\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi +% +\def\texinfoversion{2013-02-01.11} +% +% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, +% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, +% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. +% +% This texinfo.tex file is free software: you can redistribute it and/or +% modify it under the terms of the GNU General Public License as +% published by the Free Software Foundation, either version 3 of the +% License, or (at your option) any later version. +% +% This texinfo.tex file 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 General Public License +% along with this program. If not, see <http://www.gnu.org/licenses/>. +% +% As a special exception, when this file is read by TeX when processing +% a Texinfo source document, you may use the result without +% restriction. This Exception is an additional permission under section 7 +% of the GNU General Public License, version 3 ("GPLv3"). +% +% Please try the latest version of texinfo.tex before submitting bug +% reports; you can get the latest version from: +% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or +% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or +% http://www.gnu.org/software/texinfo/ (the Texinfo home page) +% The texinfo.tex in any given distribution could well be out +% of date, so if that's what you're using, please check. +% +% Send bug reports to bug-texinfo@gnu.org. Please include including a +% complete document in each bug report with which we can reproduce the +% problem. Patches are, of course, greatly appreciated. +% +% To process a Texinfo manual with TeX, it's most reliable to use the +% texi2dvi shell script that comes with the distribution. For a simple +% manual foo.texi, however, you can get away with this: +% tex foo.texi +% texindex foo.?? +% tex foo.texi +% tex foo.texi +% dvips foo.dvi -o # or whatever; this makes foo.ps. +% The extra TeX runs get the cross-reference information correct. +% Sometimes one run after texindex suffices, and sometimes you need more +% than two; texi2dvi does it as many times as necessary. +% +% It is possible to adapt texinfo.tex for other languages, to some +% extent. You can get the existing language-specific files from the +% full Texinfo distribution. +% +% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. + + +\message{Loading texinfo [version \texinfoversion]:} + +% If in a .fmt file, print the version number +% and turn on active characters that we couldn't do earlier because +% they might have appeared in the input file name. +\everyjob{\message{[Texinfo version \texinfoversion]}% + \catcode`+=\active \catcode`\_=\active} + +\chardef\other=12 + +% We never want plain's \outer definition of \+ in Texinfo. +% For @tex, we can use \tabalign. +\let\+ = \relax + +% Save some plain tex macros whose names we will redefine. +\let\ptexb=\b +\let\ptexbullet=\bullet +\let\ptexc=\c +\let\ptexcomma=\, +\let\ptexdot=\. +\let\ptexdots=\dots +\let\ptexend=\end +\let\ptexequiv=\equiv +\let\ptexexclam=\! +\let\ptexfootnote=\footnote +\let\ptexgtr=> +\let\ptexhat=^ +\let\ptexi=\i +\let\ptexindent=\indent +\let\ptexinsert=\insert +\let\ptexlbrace=\{ +\let\ptexless=< +\let\ptexnewwrite\newwrite +\let\ptexnoindent=\noindent +\let\ptexplus=+ +\let\ptexraggedright=\raggedright +\let\ptexrbrace=\} +\let\ptexslash=\/ +\let\ptexstar=\* +\let\ptext=\t +\let\ptextop=\top +{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode + +% If this character appears in an error message or help string, it +% starts a new line in the output. +\newlinechar = `^^J + +% Use TeX 3.0's \inputlineno to get the line number, for better error +% messages, but if we're using an old version of TeX, don't do anything. +% +\ifx\inputlineno\thisisundefined + \let\linenumber = \empty % Pre-3.0. +\else + \def\linenumber{l.\the\inputlineno:\space} +\fi + +% Set up fixed words for English if not already set. +\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi +\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi +\ifx\putworderror\undefined \gdef\putworderror{error}\fi +\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi +\ifx\putwordin\undefined \gdef\putwordin{in}\fi +\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi +\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi +\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi +\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi +\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi +\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi +\ifx\putwordof\undefined \gdef\putwordof{of}\fi +\ifx\putwordon\undefined \gdef\putwordon{on}\fi +\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi +\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi +\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi +\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi +\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi +\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi +\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi +% +\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi +\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi +\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi +\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi +\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi +\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi +\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi +\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi +\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi +\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi +\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi +\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi +% +\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi +\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi +\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi +\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi +\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi + +% Since the category of space is not known, we have to be careful. +\chardef\spacecat = 10 +\def\spaceisspace{\catcode`\ =\spacecat} + +% sometimes characters are active, so we need control sequences. +\chardef\ampChar = `\& +\chardef\colonChar = `\: +\chardef\commaChar = `\, +\chardef\dashChar = `\- +\chardef\dotChar = `\. +\chardef\exclamChar= `\! +\chardef\hashChar = `\# +\chardef\lquoteChar= `\` +\chardef\questChar = `\? +\chardef\rquoteChar= `\' +\chardef\semiChar = `\; +\chardef\slashChar = `\/ +\chardef\underChar = `\_ + +% Ignore a token. +% +\def\gobble#1{} + +% The following is used inside several \edef's. +\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname} + +% Hyphenation fixes. +\hyphenation{ + Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script + ap-pen-dix bit-map bit-maps + data-base data-bases eshell fall-ing half-way long-est man-u-script + man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm + par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces + spell-ing spell-ings + stand-alone strong-est time-stamp time-stamps which-ever white-space + wide-spread wrap-around +} + +% Margin to add to right of even pages, to left of odd pages. +\newdimen\bindingoffset +\newdimen\normaloffset +\newdimen\pagewidth \newdimen\pageheight + +% For a final copy, take out the rectangles +% that mark overfull boxes (in case you have decided +% that the text looks ok even though it passes the margin). +% +\def\finalout{\overfullrule=0pt } + +% Sometimes it is convenient to have everything in the transcript file +% and nothing on the terminal. We don't just call \tracingall here, +% since that produces some useless output on the terminal. We also make +% some effort to order the tracing commands to reduce output in the log +% file; cf. trace.sty in LaTeX. +% +\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% +\def\loggingall{% + \tracingstats2 + \tracingpages1 + \tracinglostchars2 % 2 gives us more in etex + \tracingparagraphs1 + \tracingoutput1 + \tracingmacros2 + \tracingrestores1 + \showboxbreadth\maxdimen \showboxdepth\maxdimen + \ifx\eTeXversion\thisisundefined\else % etex gives us more logging + \tracingscantokens1 + \tracingifs1 + \tracinggroups1 + \tracingnesting2 + \tracingassigns1 + \fi + \tracingcommands3 % 3 gives us more in etex + \errorcontextlines16 +}% + +% @errormsg{MSG}. Do the index-like expansions on MSG, but if things +% aren't perfect, it's not the end of the world, being an error message, +% after all. +% +\def\errormsg{\begingroup \indexnofonts \doerrormsg} +\def\doerrormsg#1{\errmessage{#1}} + +% add check for \lastpenalty to plain's definitions. If the last thing +% we did was a \nobreak, we don't want to insert more space. +% +\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount + \removelastskip\penalty-50\smallskip\fi\fi} +\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount + \removelastskip\penalty-100\medskip\fi\fi} +\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount + \removelastskip\penalty-200\bigskip\fi\fi} + +% Do @cropmarks to get crop marks. +% +\newif\ifcropmarks +\let\cropmarks = \cropmarkstrue +% +% Dimensions to add cropmarks at corners. +% Added by P. A. MacKay, 12 Nov. 1986 +% +\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines +\newdimen\cornerlong \cornerlong=1pc +\newdimen\cornerthick \cornerthick=.3pt +\newdimen\topandbottommargin \topandbottommargin=.75in + +% Output a mark which sets \thischapter, \thissection and \thiscolor. +% We dump everything together because we only have one kind of mark. +% This works because we only use \botmark / \topmark, not \firstmark. +% +% A mark contains a subexpression of the \ifcase ... \fi construct. +% \get*marks macros below extract the needed part using \ifcase. +% +% Another complication is to let the user choose whether \thischapter +% (\thissection) refers to the chapter (section) in effect at the top +% of a page, or that at the bottom of a page. The solution is +% described on page 260 of The TeXbook. It involves outputting two +% marks for the sectioning macros, one before the section break, and +% one after. I won't pretend I can describe this better than DEK... +\def\domark{% + \toks0=\expandafter{\lastchapterdefs}% + \toks2=\expandafter{\lastsectiondefs}% + \toks4=\expandafter{\prevchapterdefs}% + \toks6=\expandafter{\prevsectiondefs}% + \toks8=\expandafter{\lastcolordefs}% + \mark{% + \the\toks0 \the\toks2 + \noexpand\or \the\toks4 \the\toks6 + \noexpand\else \the\toks8 + }% +} +% \topmark doesn't work for the very first chapter (after the title +% page or the contents), so we use \firstmark there -- this gets us +% the mark with the chapter defs, unless the user sneaks in, e.g., +% @setcolor (or @url, or @link, etc.) between @contents and the very +% first @chapter. +\def\gettopheadingmarks{% + \ifcase0\topmark\fi + \ifx\thischapter\empty \ifcase0\firstmark\fi \fi +} +\def\getbottomheadingmarks{\ifcase1\botmark\fi} +\def\getcolormarks{\ifcase2\topmark\fi} + +% Avoid "undefined control sequence" errors. +\def\lastchapterdefs{} +\def\lastsectiondefs{} +\def\prevchapterdefs{} +\def\prevsectiondefs{} +\def\lastcolordefs{} + +% Main output routine. +\chardef\PAGE = 255 +\output = {\onepageout{\pagecontents\PAGE}} + +\newbox\headlinebox +\newbox\footlinebox + +% \onepageout takes a vbox as an argument. Note that \pagecontents +% does insertions, but you have to call it yourself. +\def\onepageout#1{% + \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi + % + \ifodd\pageno \advance\hoffset by \bindingoffset + \else \advance\hoffset by -\bindingoffset\fi + % + % Do this outside of the \shipout so @code etc. will be expanded in + % the headline as they should be, not taken literally (outputting ''code). + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi + \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% + \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi + \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% + % + {% + % Have to do this stuff outside the \shipout because we want it to + % take effect in \write's, yet the group defined by the \vbox ends + % before the \shipout runs. + % + \indexdummies % don't expand commands in the output. + \normalturnoffactive % \ in index entries must not stay \, e.g., if + % the page break happens to be in the middle of an example. + % We don't want .vr (or whatever) entries like this: + % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} + % "\acronym" won't work when it's read back in; + % it needs to be + % {\code {{\tt \backslashcurfont }acronym} + \shipout\vbox{% + % Do this early so pdf references go to the beginning of the page. + \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi + % + \ifcropmarks \vbox to \outervsize\bgroup + \hsize = \outerhsize + \vskip-\topandbottommargin + \vtop to0pt{% + \line{\ewtop\hfil\ewtop}% + \nointerlineskip + \line{% + \vbox{\moveleft\cornerthick\nstop}% + \hfill + \vbox{\moveright\cornerthick\nstop}% + }% + \vss}% + \vskip\topandbottommargin + \line\bgroup + \hfil % center the page within the outer (page) hsize. + \ifodd\pageno\hskip\bindingoffset\fi + \vbox\bgroup + \fi + % + \unvbox\headlinebox + \pagebody{#1}% + \ifdim\ht\footlinebox > 0pt + % Only leave this space if the footline is nonempty. + % (We lessened \vsize for it in \oddfootingyyy.) + % The \baselineskip=24pt in plain's \makefootline has no effect. + \vskip 24pt + \unvbox\footlinebox + \fi + % + \ifcropmarks + \egroup % end of \vbox\bgroup + \hfil\egroup % end of (centering) \line\bgroup + \vskip\topandbottommargin plus1fill minus1fill + \boxmaxdepth = \cornerthick + \vbox to0pt{\vss + \line{% + \vbox{\moveleft\cornerthick\nsbot}% + \hfill + \vbox{\moveright\cornerthick\nsbot}% + }% + \nointerlineskip + \line{\ewbot\hfil\ewbot}% + }% + \egroup % \vbox from first cropmarks clause + \fi + }% end of \shipout\vbox + }% end of group with \indexdummies + \advancepageno + \ifnum\outputpenalty>-20000 \else\dosupereject\fi +} + +\newinsert\margin \dimen\margin=\maxdimen + +\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} +{\catcode`\@ =11 +\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi +% marginal hacks, juha@viisa.uucp (Juha Takala) +\ifvoid\margin\else % marginal info is present + \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi +\dimen@=\dp#1\relax \unvbox#1\relax +\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi +\ifr@ggedbottom \kern-\dimen@ \vfil \fi} +} + +% Here are the rules for the cropmarks. Note that they are +% offset so that the space between them is truly \outerhsize or \outervsize +% (P. A. MacKay, 12 November, 1986) +% +\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} +\def\nstop{\vbox + {\hrule height\cornerthick depth\cornerlong width\cornerthick}} +\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} +\def\nsbot{\vbox + {\hrule height\cornerlong depth\cornerthick width\cornerthick}} + +% Parse an argument, then pass it to #1. The argument is the rest of +% the input line (except we remove a trailing comment). #1 should be a +% macro which expects an ordinary undelimited TeX argument. +% +\def\parsearg{\parseargusing{}} +\def\parseargusing#1#2{% + \def\argtorun{#2}% + \begingroup + \obeylines + \spaceisspace + #1% + \parseargline\empty% Insert the \empty token, see \finishparsearg below. +} + +{\obeylines % + \gdef\parseargline#1^^M{% + \endgroup % End of the group started in \parsearg. + \argremovecomment #1\comment\ArgTerm% + }% +} + +% First remove any @comment, then any @c comment. +\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} +\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} + +% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space. +% +% \argremovec might leave us with trailing space, e.g., +% @end itemize @c foo +% This space token undergoes the same procedure and is eventually removed +% by \finishparsearg. +% +\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} +\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} +\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% + \def\temp{#3}% + \ifx\temp\empty + % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: + \let\temp\finishparsearg + \else + \let\temp\argcheckspaces + \fi + % Put the space token in: + \temp#1 #3\ArgTerm +} + +% If a _delimited_ argument is enclosed in braces, they get stripped; so +% to get _exactly_ the rest of the line, we had to prevent such situation. +% We prepended an \empty token at the very beginning and we expand it now, +% just before passing the control to \argtorun. +% (Similarly, we have to think about #3 of \argcheckspacesY above: it is +% either the null string, or it ends with \^^M---thus there is no danger +% that a pair of braces would be stripped. +% +% But first, we have to remove the trailing space token. +% +\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} + +% \parseargdef\foo{...} +% is roughly equivalent to +% \def\foo{\parsearg\Xfoo} +% \def\Xfoo#1{...} +% +% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my +% favourite TeX trick. --kasal, 16nov03 + +\def\parseargdef#1{% + \expandafter \doparseargdef \csname\string#1\endcsname #1% +} +\def\doparseargdef#1#2{% + \def#2{\parsearg#1}% + \def#1##1% +} + +% Several utility definitions with active space: +{ + \obeyspaces + \gdef\obeyedspace{ } + + % Make each space character in the input produce a normal interword + % space in the output. Don't allow a line break at this space, as this + % is used only in environments like @example, where each line of input + % should produce a line of output anyway. + % + \gdef\sepspaces{\obeyspaces\let =\tie} + + % If an index command is used in an @example environment, any spaces + % therein should become regular spaces in the raw index file, not the + % expansion of \tie (\leavevmode \penalty \@M \ ). + \gdef\unsepspaces{\let =\space} +} + + +\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} + +% Define the framework for environments in texinfo.tex. It's used like this: +% +% \envdef\foo{...} +% \def\Efoo{...} +% +% It's the responsibility of \envdef to insert \begingroup before the +% actual body; @end closes the group after calling \Efoo. \envdef also +% defines \thisenv, so the current environment is known; @end checks +% whether the environment name matches. The \checkenv macro can also be +% used to check whether the current environment is the one expected. +% +% Non-false conditionals (@iftex, @ifset) don't fit into this, so they +% are not treated as environments; they don't open a group. (The +% implementation of @end takes care not to call \endgroup in this +% special case.) + + +% At run-time, environments start with this: +\def\startenvironment#1{\begingroup\def\thisenv{#1}} +% initialize +\let\thisenv\empty + +% ... but they get defined via ``\envdef\foo{...}'': +\long\def\envdef#1#2{\def#1{\startenvironment#1#2}} +\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} + +% Check whether we're in the right environment: +\def\checkenv#1{% + \def\temp{#1}% + \ifx\thisenv\temp + \else + \badenverr + \fi +} + +% Environment mismatch, #1 expected: +\def\badenverr{% + \errhelp = \EMsimple + \errmessage{This command can appear only \inenvironment\temp, + not \inenvironment\thisenv}% +} +\def\inenvironment#1{% + \ifx#1\empty + outside of any environment% + \else + in environment \expandafter\string#1% + \fi +} + +% @end foo executes the definition of \Efoo. +% But first, it executes a specialized version of \checkenv +% +\parseargdef\end{% + \if 1\csname iscond.#1\endcsname + \else + % The general wording of \badenverr may not be ideal. + \expandafter\checkenv\csname#1\endcsname + \csname E#1\endcsname + \endgroup + \fi +} + +\newhelp\EMsimple{Press RETURN to continue.} + + +% Be sure we're in horizontal mode when doing a tie, since we make space +% equivalent to this in @example-like environments. Otherwise, a space +% at the beginning of a line will start with \penalty -- and +% since \penalty is valid in vertical mode, we'd end up putting the +% penalty on the vertical list instead of in the new paragraph. +{\catcode`@ = 11 + % Avoid using \@M directly, because that causes trouble + % if the definition is written into an index file. + \global\let\tiepenalty = \@M + \gdef\tie{\leavevmode\penalty\tiepenalty\ } +} + +% @: forces normal size whitespace following. +\def\:{\spacefactor=1000 } + +% @* forces a line break. +\def\*{\unskip\hfil\break\hbox{}\ignorespaces} + +% @/ allows a line break. +\let\/=\allowbreak + +% @. is an end-of-sentence period. +\def\.{.\spacefactor=\endofsentencespacefactor\space} + +% @! is an end-of-sentence bang. +\def\!{!\spacefactor=\endofsentencespacefactor\space} + +% @? is an end-of-sentence query. +\def\?{?\spacefactor=\endofsentencespacefactor\space} + +% @frenchspacing on|off says whether to put extra space after punctuation. +% +\def\onword{on} +\def\offword{off} +% +\parseargdef\frenchspacing{% + \def\temp{#1}% + \ifx\temp\onword \plainfrenchspacing + \else\ifx\temp\offword \plainnonfrenchspacing + \else + \errhelp = \EMsimple + \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% + \fi\fi +} + +% @w prevents a word break. Without the \leavevmode, @w at the +% beginning of a paragraph, when TeX is still in vertical mode, would +% produce a whole line of output instead of starting the paragraph. +\def\w#1{\leavevmode\hbox{#1}} + +% @group ... @end group forces ... to be all on one page, by enclosing +% it in a TeX vbox. We use \vtop instead of \vbox to construct the box +% to keep its height that of a normal line. According to the rules for +% \topskip (p.114 of the TeXbook), the glue inserted is +% max (\topskip - \ht (first item), 0). If that height is large, +% therefore, no glue is inserted, and the space between the headline and +% the text is small, which looks bad. +% +% Another complication is that the group might be very large. This can +% cause the glue on the previous page to be unduly stretched, because it +% does not have much material. In this case, it's better to add an +% explicit \vfill so that the extra space is at the bottom. The +% threshold for doing this is if the group is more than \vfilllimit +% percent of a page (\vfilllimit can be changed inside of @tex). +% +\newbox\groupbox +\def\vfilllimit{0.7} +% +\envdef\group{% + \ifnum\catcode`\^^M=\active \else + \errhelp = \groupinvalidhelp + \errmessage{@group invalid in context where filling is enabled}% + \fi + \startsavinginserts + % + \setbox\groupbox = \vtop\bgroup + % Do @comment since we are called inside an environment such as + % @example, where each end-of-line in the input causes an + % end-of-line in the output. We don't want the end-of-line after + % the `@group' to put extra space in the output. Since @group + % should appear on a line by itself (according to the Texinfo + % manual), we don't worry about eating any user text. + \comment +} +% +% The \vtop produces a box with normal height and large depth; thus, TeX puts +% \baselineskip glue before it, and (when the next line of text is done) +% \lineskip glue after it. Thus, space below is not quite equal to space +% above. But it's pretty close. +\def\Egroup{% + % To get correct interline space between the last line of the group + % and the first line afterwards, we have to propagate \prevdepth. + \endgraf % Not \par, as it may have been set to \lisppar. + \global\dimen1 = \prevdepth + \egroup % End the \vtop. + % \dimen0 is the vertical size of the group's box. + \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox + % \dimen2 is how much space is left on the page (more or less). + \dimen2 = \pageheight \advance\dimen2 by -\pagetotal + % if the group doesn't fit on the current page, and it's a big big + % group, force a page break. + \ifdim \dimen0 > \dimen2 + \ifdim \pagetotal < \vfilllimit\pageheight + \page + \fi + \fi + \box\groupbox + \prevdepth = \dimen1 + \checkinserts +} +% +% TeX puts in an \escapechar (i.e., `@') at the beginning of the help +% message, so this ends up printing `@group can only ...'. +% +\newhelp\groupinvalidhelp{% +group can only be used in environments such as @example,^^J% +where each line of input produces a line of output.} + +% @need space-in-mils +% forces a page break if there is not space-in-mils remaining. + +\newdimen\mil \mil=0.001in + +\parseargdef\need{% + % Ensure vertical mode, so we don't make a big box in the middle of a + % paragraph. + \par + % + % If the @need value is less than one line space, it's useless. + \dimen0 = #1\mil + \dimen2 = \ht\strutbox + \advance\dimen2 by \dp\strutbox + \ifdim\dimen0 > \dimen2 + % + % Do a \strut just to make the height of this box be normal, so the + % normal leading is inserted relative to the preceding line. + % And a page break here is fine. + \vtop to #1\mil{\strut\vfil}% + % + % TeX does not even consider page breaks if a penalty added to the + % main vertical list is 10000 or more. But in order to see if the + % empty box we just added fits on the page, we must make it consider + % page breaks. On the other hand, we don't want to actually break the + % page after the empty box. So we use a penalty of 9999. + % + % There is an extremely small chance that TeX will actually break the + % page at this \penalty, if there are no other feasible breakpoints in + % sight. (If the user is using lots of big @group commands, which + % almost-but-not-quite fill up a page, TeX will have a hard time doing + % good page breaking, for example.) However, I could not construct an + % example where a page broke at this \penalty; if it happens in a real + % document, then we can reconsider our strategy. + \penalty9999 + % + % Back up by the size of the box, whether we did a page break or not. + \kern -#1\mil + % + % Do not allow a page break right after this kern. + \nobreak + \fi +} + +% @br forces paragraph break (and is undocumented). + +\let\br = \par + +% @page forces the start of a new page. +% +\def\page{\par\vfill\supereject} + +% @exdent text.... +% outputs text on separate line in roman font, starting at standard page margin + +% This records the amount of indent in the innermost environment. +% That's how much \exdent should take out. +\newskip\exdentamount + +% This defn is used inside fill environments such as @defun. +\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break} + +% This defn is used inside nofill environments such as @example. +\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount + \leftline{\hskip\leftskip{\rm#1}}}} + +% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current +% paragraph. For more general purposes, use the \margin insertion +% class. WHICH is `l' or `r'. Not documented, written for gawk manual. +% +\newskip\inmarginspacing \inmarginspacing=1cm +\def\strutdepth{\dp\strutbox} +% +\def\doinmargin#1#2{\strut\vadjust{% + \nobreak + \kern-\strutdepth + \vtop to \strutdepth{% + \baselineskip=\strutdepth + \vss + % if you have multiple lines of stuff to put here, you'll need to + % make the vbox yourself of the appropriate size. + \ifx#1l% + \llap{\ignorespaces #2\hskip\inmarginspacing}% + \else + \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}% + \fi + \null + }% +}} +\def\inleftmargin{\doinmargin l} +\def\inrightmargin{\doinmargin r} +% +% @inmargin{TEXT [, RIGHT-TEXT]} +% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right; +% else use TEXT for both). +% +\def\inmargin#1{\parseinmargin #1,,\finish} +\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing. + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \def\lefttext{#1}% have both texts + \def\righttext{#2}% + \else + \def\lefttext{#1}% have only one text + \def\righttext{#1}% + \fi + % + \ifodd\pageno + \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin + \else + \def\temp{\inleftmargin\lefttext}% + \fi + \temp +} + +% @| inserts a changebar to the left of the current line. It should +% surround any changed text. This approach does *not* work if the +% change spans more than two lines of output. To handle that, we would +% have adopt a much more difficult approach (putting marks into the main +% vertical list for the beginning and end of each change). This command +% is not documented, not supported, and doesn't work. +% +\def\|{% + % \vadjust can only be used in horizontal mode. + \leavevmode + % + % Append this vertical mode material after the current line in the output. + \vadjust{% + % We want to insert a rule with the height and depth of the current + % leading; that is exactly what \strutbox is supposed to record. + \vskip-\baselineskip + % + % \vadjust-items are inserted at the left edge of the type. So + % the \llap here moves out into the left-hand margin. + \llap{% + % + % For a thicker or thinner bar, change the `1pt'. + \vrule height\baselineskip width1pt + % + % This is the space between the bar and the text. + \hskip 12pt + }% + }% +} + +% @include FILE -- \input text of FILE. +% +\def\include{\parseargusing\filenamecatcodes\includezzz} +\def\includezzz#1{% + \pushthisfilestack + \def\thisfile{#1}% + {% + \makevalueexpandable % we want to expand any @value in FILE. + \turnoffactive % and allow special characters in the expansion + \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @include of #1^^J}% + \edef\temp{\noexpand\input #1 }% + % + % This trickery is to read FILE outside of a group, in case it makes + % definitions, etc. + \expandafter + }\temp + \popthisfilestack +} +\def\filenamecatcodes{% + \catcode`\\=\other + \catcode`~=\other + \catcode`^=\other + \catcode`_=\other + \catcode`|=\other + \catcode`<=\other + \catcode`>=\other + \catcode`+=\other + \catcode`-=\other + \catcode`\`=\other + \catcode`\'=\other +} + +\def\pushthisfilestack{% + \expandafter\pushthisfilestackX\popthisfilestack\StackTerm +} +\def\pushthisfilestackX{% + \expandafter\pushthisfilestackY\thisfile\StackTerm +} +\def\pushthisfilestackY #1\StackTerm #2\StackTerm {% + \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}% +} + +\def\popthisfilestack{\errthisfilestackempty} +\def\errthisfilestackempty{\errmessage{Internal error: + the stack of filenames is empty.}} +% +\def\thisfile{} + +% @center line +% outputs that line, centered. +% +\parseargdef\center{% + \ifhmode + \let\centersub\centerH + \else + \let\centersub\centerV + \fi + \centersub{\hfil \ignorespaces#1\unskip \hfil}% + \let\centersub\relax % don't let the definition persist, just in case +} +\def\centerH#1{{% + \hfil\break + \advance\hsize by -\leftskip + \advance\hsize by -\rightskip + \line{#1}% + \break +}} +% +\newcount\centerpenalty +\def\centerV#1{% + % The idea here is the same as in \startdefun, \cartouche, etc.: if + % @center is the first thing after a section heading, we need to wipe + % out the negative parskip inserted by \sectionheading, but still + % prevent a page break here. + \centerpenalty = \lastpenalty + \ifnum\centerpenalty>10000 \vskip\parskip \fi + \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi + \line{\kern\leftskip #1\kern\rightskip}% +} + +% @sp n outputs n lines of vertical space +% +\parseargdef\sp{\vskip #1\baselineskip} + +% @comment ...line which is ignored... +% @c is the same as @comment +% @ignore ... @end ignore is another way to write a comment +% +\def\comment{\begingroup \catcode`\^^M=\other% +\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% +\commentxxx} +{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} +% +\let\c=\comment + +% @paragraphindent NCHARS +% We'll use ems for NCHARS, close enough. +% NCHARS can also be the word `asis' or `none'. +% We cannot feasibly implement @paragraphindent asis, though. +% +\def\asisword{asis} % no translation, these are keywords +\def\noneword{none} +% +\parseargdef\paragraphindent{% + \def\temp{#1}% + \ifx\temp\asisword + \else + \ifx\temp\noneword + \defaultparindent = 0pt + \else + \defaultparindent = #1em + \fi + \fi + \parindent = \defaultparindent +} + +% @exampleindent NCHARS +% We'll use ems for NCHARS like @paragraphindent. +% It seems @exampleindent asis isn't necessary, but +% I preserve it to make it similar to @paragraphindent. +\parseargdef\exampleindent{% + \def\temp{#1}% + \ifx\temp\asisword + \else + \ifx\temp\noneword + \lispnarrowing = 0pt + \else + \lispnarrowing = #1em + \fi + \fi +} + +% @firstparagraphindent WORD +% If WORD is `none', then suppress indentation of the first paragraph +% after a section heading. If WORD is `insert', then do indent at such +% paragraphs. +% +% The paragraph indentation is suppressed or not by calling +% \suppressfirstparagraphindent, which the sectioning commands do. +% We switch the definition of this back and forth according to WORD. +% By default, we suppress indentation. +% +\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} +\def\insertword{insert} +% +\parseargdef\firstparagraphindent{% + \def\temp{#1}% + \ifx\temp\noneword + \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent + \else\ifx\temp\insertword + \let\suppressfirstparagraphindent = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @firstparagraphindent option `\temp'}% + \fi\fi +} + +% Here is how we actually suppress indentation. Redefine \everypar to +% \kern backwards by \parindent, and then reset itself to empty. +% +% We also make \indent itself not actually do anything until the next +% paragraph. +% +\gdef\dosuppressfirstparagraphindent{% + \gdef\indent{% + \restorefirstparagraphindent + \indent + }% + \gdef\noindent{% + \restorefirstparagraphindent + \noindent + }% + \global\everypar = {% + \kern -\parindent + \restorefirstparagraphindent + }% +} + +\gdef\restorefirstparagraphindent{% + \global \let \indent = \ptexindent + \global \let \noindent = \ptexnoindent + \global \everypar = {}% +} + + +% @refill is a no-op. +\let\refill=\relax + +% If working on a large document in chapters, it is convenient to +% be able to disable indexing, cross-referencing, and contents, for test runs. +% This is done with @novalidate (before @setfilename). +% +\newif\iflinks \linkstrue % by default we want the aux files. +\let\novalidate = \linksfalse + +% @setfilename is done at the beginning of every texinfo file. +% So open here the files we need to have open while reading the input. +% This makes it possible to make a .fmt file for texinfo. +\def\setfilename{% + \fixbackslash % Turn off hack to swallow `\input texinfo'. + \iflinks + \tryauxfile + % Open the new aux file. TeX will close it automatically at exit. + \immediate\openout\auxfile=\jobname.aux + \fi % \openindices needs to do some work in any case. + \openindices + \let\setfilename=\comment % Ignore extra @setfilename cmds. + % + % If texinfo.cnf is present on the system, read it. + % Useful for site-wide @afourpaper, etc. + \openin 1 texinfo.cnf + \ifeof 1 \else \input texinfo.cnf \fi + \closein 1 + % + \comment % Ignore the actual filename. +} + +% Called from \setfilename. +% +\def\openindices{% + \newindex{cp}% + \newcodeindex{fn}% + \newcodeindex{vr}% + \newcodeindex{tp}% + \newcodeindex{ky}% + \newcodeindex{pg}% +} + +% @bye. +\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} + + +\message{pdf,} +% adobe `portable' document format +\newcount\tempnum +\newcount\lnkcount +\newtoks\filename +\newcount\filenamelength +\newcount\pgn +\newtoks\toksA +\newtoks\toksB +\newtoks\toksC +\newtoks\toksD +\newbox\boxA +\newcount\countA +\newif\ifpdf +\newif\ifpdfmakepagedest + +% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 +% can be set). So we test for \relax and 0 as well as being undefined. +\ifx\pdfoutput\thisisundefined +\else + \ifx\pdfoutput\relax + \else + \ifcase\pdfoutput + \else + \pdftrue + \fi + \fi +\fi + +% PDF uses PostScript string constants for the names of xref targets, +% for display in the outlines, and in other places. Thus, we have to +% double any backslashes. Otherwise, a name like "\node" will be +% interpreted as a newline (\n), followed by o, d, e. Not good. +% +% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and +% related messages. The final outcome is that it is up to the TeX user +% to double the backslashes and otherwise make the string valid, so +% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to +% do this reliably, so we use it. + +% #1 is a control sequence in which to do the replacements, +% which we \xdef. +\def\txiescapepdf#1{% + \ifx\pdfescapestring\thisisundefined + % No primitive available; should we give a warning or log? + % Many times it won't matter. + \else + % The expandable \pdfescapestring primitive escapes parentheses, + % backslashes, and other special chars. + \xdef#1{\pdfescapestring{#1}}% + \fi +} + +\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images +with PDF output, and none of those formats could be found. (.eps cannot +be supported due to the design of the PDF format; use regular TeX (DVI +output) for that.)} + +\ifpdf + % + % Color manipulation macros based on pdfcolor.tex, + % except using rgb instead of cmyk; the latter is said to render as a + % very dark gray on-screen and a very dark halftone in print, instead + % of actual black. + \def\rgbDarkRed{0.50 0.09 0.12} + \def\rgbBlack{0 0 0} + % + % k sets the color for filling (usual text, etc.); + % K sets the color for stroking (thin rules, e.g., normal _'s). + \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} + % + % Set color, and create a mark which defines \thiscolor accordingly, + % so that \makeheadline knows which color to restore. + \def\setcolor#1{% + \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% + \domark + \pdfsetcolor{#1}% + } + % + \def\maincolor{\rgbBlack} + \pdfsetcolor{\maincolor} + \edef\thiscolor{\maincolor} + \def\lastcolordefs{} + % + \def\makefootline{% + \baselineskip24pt + \line{\pdfsetcolor{\maincolor}\the\footline}% + } + % + \def\makeheadline{% + \vbox to 0pt{% + \vskip-22.5pt + \line{% + \vbox to8.5pt{}% + % Extract \thiscolor definition from the marks. + \getcolormarks + % Typeset the headline with \maincolor, then restore the color. + \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% + }% + \vss + }% + \nointerlineskip + } + % + % + \pdfcatalog{/PageMode /UseOutlines} + % + % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). + \def\dopdfimage#1#2#3{% + \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% + \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% + % + % pdftex (and the PDF format) support .pdf, .png, .jpg (among + % others). Let's try in that order, PDF first since if + % someone has a scalable image, presumably better to use that than a + % bitmap. + \let\pdfimgext=\empty + \begingroup + \openin 1 #1.pdf \ifeof 1 + \openin 1 #1.PDF \ifeof 1 + \openin 1 #1.png \ifeof 1 + \openin 1 #1.jpg \ifeof 1 + \openin 1 #1.jpeg \ifeof 1 + \openin 1 #1.JPG \ifeof 1 + \errhelp = \nopdfimagehelp + \errmessage{Could not find image file #1 for pdf}% + \else \gdef\pdfimgext{JPG}% + \fi + \else \gdef\pdfimgext{jpeg}% + \fi + \else \gdef\pdfimgext{jpg}% + \fi + \else \gdef\pdfimgext{png}% + \fi + \else \gdef\pdfimgext{PDF}% + \fi + \else \gdef\pdfimgext{pdf}% + \fi + \closein 1 + \endgroup + % + % without \immediate, ancient pdftex seg faults when the same image is + % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) + \ifnum\pdftexversion < 14 + \immediate\pdfimage + \else + \immediate\pdfximage + \fi + \ifdim \wd0 >0pt width \pdfimagewidth \fi + \ifdim \wd2 >0pt height \pdfimageheight \fi + \ifnum\pdftexversion<13 + #1.\pdfimgext + \else + {#1.\pdfimgext}% + \fi + \ifnum\pdftexversion < 14 \else + \pdfrefximage \pdflastximage + \fi} + % + \def\pdfmkdest#1{{% + % We have to set dummies so commands such as @code, and characters + % such as \, aren't expanded when present in a section title. + \indexnofonts + \turnoffactive + \makevalueexpandable + \def\pdfdestname{#1}% + \txiescapepdf\pdfdestname + \safewhatsit{\pdfdest name{\pdfdestname} xyz}% + }} + % + % used to mark target names; must be expandable. + \def\pdfmkpgn#1{#1} + % + % by default, use a color that is dark enough to print on paper as + % nearly black, but still distinguishable for online viewing. + \def\urlcolor{\rgbDarkRed} + \def\linkcolor{\rgbDarkRed} + \def\endlink{\setcolor{\maincolor}\pdfendlink} + % + % Adding outlines to PDF; macros for calculating structure of outlines + % come from Petr Olsak + \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% + \else \csname#1\endcsname \fi} + \def\advancenumber#1{\tempnum=\expnumber{#1}\relax + \advance\tempnum by 1 + \expandafter\xdef\csname#1\endcsname{\the\tempnum}} + % + % #1 is the section text, which is what will be displayed in the + % outline by the pdf viewer. #2 is the pdf expression for the number + % of subentries (or empty, for subsubsections). #3 is the node text, + % which might be empty if this toc entry had no corresponding node. + % #4 is the page number + % + \def\dopdfoutline#1#2#3#4{% + % Generate a link to the node text if that exists; else, use the + % page number. We could generate a destination for the section + % text in the case where a section has no node, but it doesn't + % seem worth the trouble, since most documents are normally structured. + \edef\pdfoutlinedest{#3}% + \ifx\pdfoutlinedest\empty + \def\pdfoutlinedest{#4}% + \else + \txiescapepdf\pdfoutlinedest + \fi + % + % Also escape PDF chars in the display string. + \edef\pdfoutlinetext{#1}% + \txiescapepdf\pdfoutlinetext + % + \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% + } + % + \def\pdfmakeoutlines{% + \begingroup + % Read toc silently, to get counts of subentries for \pdfoutline. + \def\partentry##1##2##3##4{}% ignore parts in the outlines + \def\numchapentry##1##2##3##4{% + \def\thischapnum{##2}% + \def\thissecnum{0}% + \def\thissubsecnum{0}% + }% + \def\numsecentry##1##2##3##4{% + \advancenumber{chap\thischapnum}% + \def\thissecnum{##2}% + \def\thissubsecnum{0}% + }% + \def\numsubsecentry##1##2##3##4{% + \advancenumber{sec\thissecnum}% + \def\thissubsecnum{##2}% + }% + \def\numsubsubsecentry##1##2##3##4{% + \advancenumber{subsec\thissubsecnum}% + }% + \def\thischapnum{0}% + \def\thissecnum{0}% + \def\thissubsecnum{0}% + % + % use \def rather than \let here because we redefine \chapentry et + % al. a second time, below. + \def\appentry{\numchapentry}% + \def\appsecentry{\numsecentry}% + \def\appsubsecentry{\numsubsecentry}% + \def\appsubsubsecentry{\numsubsubsecentry}% + \def\unnchapentry{\numchapentry}% + \def\unnsecentry{\numsecentry}% + \def\unnsubsecentry{\numsubsecentry}% + \def\unnsubsubsecentry{\numsubsubsecentry}% + \readdatafile{toc}% + % + % Read toc second time, this time actually producing the outlines. + % The `-' means take the \expnumber as the absolute number of + % subentries, which we calculated on our first read of the .toc above. + % + % We use the node names as the destinations. + \def\numchapentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% + \def\numsecentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% + \def\numsubsecentry##1##2##3##4{% + \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% + \def\numsubsubsecentry##1##2##3##4{% count is always zero + \dopdfoutline{##1}{}{##3}{##4}}% + % + % PDF outlines are displayed using system fonts, instead of + % document fonts. Therefore we cannot use special characters, + % since the encoding is unknown. For example, the eogonek from + % Latin 2 (0xea) gets translated to a | character. Info from + % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. + % + % TODO this right, we have to translate 8-bit characters to + % their "best" equivalent, based on the @documentencoding. Too + % much work for too little return. Just use the ASCII equivalents + % we use for the index sort strings. + % + \indexnofonts + \setupdatafile + % We can have normal brace characters in the PDF outlines, unlike + % Texinfo index files. So set that up. + \def\{{\lbracecharliteral}% + \def\}{\rbracecharliteral}% + \catcode`\\=\active \otherbackslash + \input \tocreadfilename + \endgroup + } + {\catcode`[=1 \catcode`]=2 + \catcode`{=\other \catcode`}=\other + \gdef\lbracecharliteral[{]% + \gdef\rbracecharliteral[}]% + ] + % + \def\skipspaces#1{\def\PP{#1}\def\D{|}% + \ifx\PP\D\let\nextsp\relax + \else\let\nextsp\skipspaces + \addtokens{\filename}{\PP}% + \advance\filenamelength by 1 + \fi + \nextsp} + \def\getfilename#1{% + \filenamelength=0 + % If we don't expand the argument now, \skipspaces will get + % snagged on things like "@value{foo}". + \edef\temp{#1}% + \expandafter\skipspaces\temp|\relax + } + \ifnum\pdftexversion < 14 + \let \startlink \pdfannotlink + \else + \let \startlink \pdfstartlink + \fi + % make a live url in pdf output. + \def\pdfurl#1{% + \begingroup + % it seems we really need yet another set of dummies; have not + % tried to figure out what each command should do in the context + % of @url. for now, just make @/ a no-op, that's the only one + % people have actually reported a problem with. + % + \normalturnoffactive + \def\@{@}% + \let\/=\empty + \makevalueexpandable + % do we want to go so far as to use \indexnofonts instead of just + % special-casing \var here? + \def\var##1{##1}% + % + \leavevmode\setcolor{\urlcolor}% + \startlink attr{/Border [0 0 0]}% + user{/Subtype /Link /A << /S /URI /URI (#1) >>}% + \endgroup} + \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} + \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} + \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} + \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} + \def\maketoks{% + \expandafter\poptoks\the\toksA|ENDTOKS|\relax + \ifx\first0\adn0 + \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 + \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 + \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 + \else + \ifnum0=\countA\else\makelink\fi + \ifx\first.\let\next=\done\else + \let\next=\maketoks + \addtokens{\toksB}{\the\toksD} + \ifx\first,\addtokens{\toksB}{\space}\fi + \fi + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \next} + \def\makelink{\addtokens{\toksB}% + {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} + \def\pdflink#1{% + \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} + \setcolor{\linkcolor}#1\endlink} + \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} +\else + % non-pdf mode + \let\pdfmkdest = \gobble + \let\pdfurl = \gobble + \let\endlink = \relax + \let\setcolor = \gobble + \let\pdfsetcolor = \gobble + \let\pdfmakeoutlines = \relax +\fi % \ifx\pdfoutput + + +\message{fonts,} + +% Change the current font style to #1, remembering it in \curfontstyle. +% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in +% italics, not bold italics. +% +\def\setfontstyle#1{% + \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. + \csname ten#1\endcsname % change the current font +} + +% Select #1 fonts with the current style. +% +\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} + +\def\rm{\fam=0 \setfontstyle{rm}} +\def\it{\fam=\itfam \setfontstyle{it}} +\def\sl{\fam=\slfam \setfontstyle{sl}} +\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} +\def\tt{\fam=\ttfam \setfontstyle{tt}} + +% Unfortunately, we have to override this for titles and the like, since +% in those cases "rm" is bold. Sigh. +\def\rmisbold{\rm\def\curfontstyle{bf}} + +% Texinfo sort of supports the sans serif font style, which plain TeX does not. +% So we set up a \sf. +\newfam\sffam +\def\sf{\fam=\sffam \setfontstyle{sf}} +\let\li = \sf % Sometimes we call it \li, not \sf. + +% We don't need math for this font style. +\def\ttsl{\setfontstyle{ttsl}} + + +% Set the baselineskip to #1, and the lineskip and strut size +% correspondingly. There is no deep meaning behind these magic numbers +% used as factors; they just match (closely enough) what Knuth defined. +% +\def\lineskipfactor{.08333} +\def\strutheightpercent{.70833} +\def\strutdepthpercent {.29167} +% +% can get a sort of poor man's double spacing by redefining this. +\def\baselinefactor{1} +% +\newdimen\textleading +\def\setleading#1{% + \dimen0 = #1\relax + \normalbaselineskip = \baselinefactor\dimen0 + \normallineskip = \lineskipfactor\normalbaselineskip + \normalbaselines + \setbox\strutbox =\hbox{% + \vrule width0pt height\strutheightpercent\baselineskip + depth \strutdepthpercent \baselineskip + }% +} + +% PDF CMaps. See also LaTeX's t1.cmap. +% +% do nothing with this by default. +\expandafter\let\csname cmapOT1\endcsname\gobble +\expandafter\let\csname cmapOT1IT\endcsname\gobble +\expandafter\let\csname cmapOT1TT\endcsname\gobble + +% if we are producing pdf, and we have \pdffontattr, then define cmaps. +% (\pdffontattr was introduced many years ago, but people still run +% older pdftex's; it's easy to conditionalize, so we do.) +\ifpdf \ifx\pdffontattr\thisisundefined \else + \begingroup + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap +%%DocumentNeededResources: ProcSet (CIDInit) +%%IncludeResource: ProcSet (CIDInit) +%%BeginResource: CMap (TeX-OT1-0) +%%Title: (TeX-OT1-0 TeX OT1 0) +%%Version: 1.000 +%%EndComments +/CIDInit /ProcSet findresource begin +12 dict begin +begincmap +/CIDSystemInfo +<< /Registry (TeX) +/Ordering (OT1) +/Supplement 0 +>> def +/CMapName /TeX-OT1-0 def +/CMapType 2 def +1 begincodespacerange +<00> <7F> +endcodespacerange +8 beginbfrange +<00> <01> <0393> +<09> <0A> <03A8> +<23> <26> <0023> +<28> <3B> <0028> +<3F> <5B> <003F> +<5D> <5E> <005D> +<61> <7A> <0061> +<7B> <7C> <2013> +endbfrange +40 beginbfchar +<02> <0398> +<03> <039B> +<04> <039E> +<05> <03A0> +<06> <03A3> +<07> <03D2> +<08> <03A6> +<0B> <00660066> +<0C> <00660069> +<0D> <0066006C> +<0E> <006600660069> +<0F> <00660066006C> +<10> <0131> +<11> <0237> +<12> <0060> +<13> <00B4> +<14> <02C7> +<15> <02D8> +<16> <00AF> +<17> <02DA> +<18> <00B8> +<19> <00DF> +<1A> <00E6> +<1B> <0153> +<1C> <00F8> +<1D> <00C6> +<1E> <0152> +<1F> <00D8> +<21> <0021> +<22> <201D> +<27> <2019> +<3C> <00A1> +<3D> <003D> +<3E> <00BF> +<5C> <201C> +<5F> <02D9> +<60> <2018> +<7D> <02DD> +<7E> <007E> +<7F> <00A8> +endbfchar +endcmap +CMapName currentdict /CMap defineresource pop +end +end +%%EndResource +%%EOF + }\endgroup + \expandafter\edef\csname cmapOT1\endcsname#1{% + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% +% +% \cmapOT1IT + \begingroup + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap +%%DocumentNeededResources: ProcSet (CIDInit) +%%IncludeResource: ProcSet (CIDInit) +%%BeginResource: CMap (TeX-OT1IT-0) +%%Title: (TeX-OT1IT-0 TeX OT1IT 0) +%%Version: 1.000 +%%EndComments +/CIDInit /ProcSet findresource begin +12 dict begin +begincmap +/CIDSystemInfo +<< /Registry (TeX) +/Ordering (OT1IT) +/Supplement 0 +>> def +/CMapName /TeX-OT1IT-0 def +/CMapType 2 def +1 begincodespacerange +<00> <7F> +endcodespacerange +8 beginbfrange +<00> <01> <0393> +<09> <0A> <03A8> +<25> <26> <0025> +<28> <3B> <0028> +<3F> <5B> <003F> +<5D> <5E> <005D> +<61> <7A> <0061> +<7B> <7C> <2013> +endbfrange +42 beginbfchar +<02> <0398> +<03> <039B> +<04> <039E> +<05> <03A0> +<06> <03A3> +<07> <03D2> +<08> <03A6> +<0B> <00660066> +<0C> <00660069> +<0D> <0066006C> +<0E> <006600660069> +<0F> <00660066006C> +<10> <0131> +<11> <0237> +<12> <0060> +<13> <00B4> +<14> <02C7> +<15> <02D8> +<16> <00AF> +<17> <02DA> +<18> <00B8> +<19> <00DF> +<1A> <00E6> +<1B> <0153> +<1C> <00F8> +<1D> <00C6> +<1E> <0152> +<1F> <00D8> +<21> <0021> +<22> <201D> +<23> <0023> +<24> <00A3> +<27> <2019> +<3C> <00A1> +<3D> <003D> +<3E> <00BF> +<5C> <201C> +<5F> <02D9> +<60> <2018> +<7D> <02DD> +<7E> <007E> +<7F> <00A8> +endbfchar +endcmap +CMapName currentdict /CMap defineresource pop +end +end +%%EndResource +%%EOF + }\endgroup + \expandafter\edef\csname cmapOT1IT\endcsname#1{% + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% +% +% \cmapOT1TT + \begingroup + \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. + \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap +%%DocumentNeededResources: ProcSet (CIDInit) +%%IncludeResource: ProcSet (CIDInit) +%%BeginResource: CMap (TeX-OT1TT-0) +%%Title: (TeX-OT1TT-0 TeX OT1TT 0) +%%Version: 1.000 +%%EndComments +/CIDInit /ProcSet findresource begin +12 dict begin +begincmap +/CIDSystemInfo +<< /Registry (TeX) +/Ordering (OT1TT) +/Supplement 0 +>> def +/CMapName /TeX-OT1TT-0 def +/CMapType 2 def +1 begincodespacerange +<00> <7F> +endcodespacerange +5 beginbfrange +<00> <01> <0393> +<09> <0A> <03A8> +<21> <26> <0021> +<28> <5F> <0028> +<61> <7E> <0061> +endbfrange +32 beginbfchar +<02> <0398> +<03> <039B> +<04> <039E> +<05> <03A0> +<06> <03A3> +<07> <03D2> +<08> <03A6> +<0B> <2191> +<0C> <2193> +<0D> <0027> +<0E> <00A1> +<0F> <00BF> +<10> <0131> +<11> <0237> +<12> <0060> +<13> <00B4> +<14> <02C7> +<15> <02D8> +<16> <00AF> +<17> <02DA> +<18> <00B8> +<19> <00DF> +<1A> <00E6> +<1B> <0153> +<1C> <00F8> +<1D> <00C6> +<1E> <0152> +<1F> <00D8> +<20> <2423> +<27> <2019> +<60> <2018> +<7F> <00A8> +endbfchar +endcmap +CMapName currentdict /CMap defineresource pop +end +end +%%EndResource +%%EOF + }\endgroup + \expandafter\edef\csname cmapOT1TT\endcsname#1{% + \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% + }% +\fi\fi + + +% Set the font macro #1 to the font named \fontprefix#2. +% #3 is the font's design size, #4 is a scale factor, #5 is the CMap +% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit). +% Example: +% #1 = \textrm +% #2 = \rmshape +% #3 = 10 +% #4 = \mainmagstep +% #5 = OT1 +% +\def\setfont#1#2#3#4#5{% + \font#1=\fontprefix#2#3 scaled #4 + \csname cmap#5\endcsname#1% +} +% This is what gets called when #5 of \setfont is empty. +\let\cmap\gobble +% +% (end of cmaps) + +% Use cm as the default font prefix. +% To specify the font prefix, you must define \fontprefix +% before you read in texinfo.tex. +\ifx\fontprefix\thisisundefined +\def\fontprefix{cm} +\fi +% Support font families that don't use the same naming scheme as CM. +\def\rmshape{r} +\def\rmbshape{bx} % where the normal face is bold +\def\bfshape{b} +\def\bxshape{bx} +\def\ttshape{tt} +\def\ttbshape{tt} +\def\ttslshape{sltt} +\def\itshape{ti} +\def\itbshape{bxti} +\def\slshape{sl} +\def\slbshape{bxsl} +\def\sfshape{ss} +\def\sfbshape{ss} +\def\scshape{csc} +\def\scbshape{csc} + +% Definitions for a main text size of 11pt. (The default in Texinfo.) +% +\def\definetextfontsizexi{% +% Text fonts (11.2pt, magstep1). +\def\textnominalsize{11pt} +\edef\mainmagstep{\magstephalf} +\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} +\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} +\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} +\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} +\setfont\textsl\slshape{10}{\mainmagstep}{OT1} +\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} +\setfont\textsc\scshape{10}{\mainmagstep}{OT1} +\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} +\font\texti=cmmi10 scaled \mainmagstep +\font\textsy=cmsy10 scaled \mainmagstep +\def\textecsize{1095} + +% A few fonts for @defun names and args. +\setfont\defbf\bfshape{10}{\magstep1}{OT1} +\setfont\deftt\ttshape{10}{\magstep1}{OT1TT} +\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} +\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} + +% Fonts for indices, footnotes, small examples (9pt). +\def\smallnominalsize{9pt} +\setfont\smallrm\rmshape{9}{1000}{OT1} +\setfont\smalltt\ttshape{9}{1000}{OT1TT} +\setfont\smallbf\bfshape{10}{900}{OT1} +\setfont\smallit\itshape{9}{1000}{OT1IT} +\setfont\smallsl\slshape{9}{1000}{OT1} +\setfont\smallsf\sfshape{9}{1000}{OT1} +\setfont\smallsc\scshape{10}{900}{OT1} +\setfont\smallttsl\ttslshape{10}{900}{OT1TT} +\font\smalli=cmmi9 +\font\smallsy=cmsy9 +\def\smallecsize{0900} + +% Fonts for small examples (8pt). +\def\smallernominalsize{8pt} +\setfont\smallerrm\rmshape{8}{1000}{OT1} +\setfont\smallertt\ttshape{8}{1000}{OT1TT} +\setfont\smallerbf\bfshape{10}{800}{OT1} +\setfont\smallerit\itshape{8}{1000}{OT1IT} +\setfont\smallersl\slshape{8}{1000}{OT1} +\setfont\smallersf\sfshape{8}{1000}{OT1} +\setfont\smallersc\scshape{10}{800}{OT1} +\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} +\font\smalleri=cmmi8 +\font\smallersy=cmsy8 +\def\smallerecsize{0800} + +% Fonts for title page (20.4pt): +\def\titlenominalsize{20pt} +\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} +\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} +\setfont\titlesl\slbshape{10}{\magstep4}{OT1} +\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} +\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} +\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} +\let\titlebf=\titlerm +\setfont\titlesc\scbshape{10}{\magstep4}{OT1} +\font\titlei=cmmi12 scaled \magstep3 +\font\titlesy=cmsy10 scaled \magstep4 +\def\titleecsize{2074} + +% Chapter (and unnumbered) fonts (17.28pt). +\def\chapnominalsize{17pt} +\setfont\chaprm\rmbshape{12}{\magstep2}{OT1} +\setfont\chapit\itbshape{10}{\magstep3}{OT1IT} +\setfont\chapsl\slbshape{10}{\magstep3}{OT1} +\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT} +\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT} +\setfont\chapsf\sfbshape{17}{1000}{OT1} +\let\chapbf=\chaprm +\setfont\chapsc\scbshape{10}{\magstep3}{OT1} +\font\chapi=cmmi12 scaled \magstep2 +\font\chapsy=cmsy10 scaled \magstep3 +\def\chapecsize{1728} + +% Section fonts (14.4pt). +\def\secnominalsize{14pt} +\setfont\secrm\rmbshape{12}{\magstep1}{OT1} +\setfont\secit\itbshape{10}{\magstep2}{OT1IT} +\setfont\secsl\slbshape{10}{\magstep2}{OT1} +\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} +\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT} +\setfont\secsf\sfbshape{12}{\magstep1}{OT1} +\let\secbf\secrm +\setfont\secsc\scbshape{10}{\magstep2}{OT1} +\font\seci=cmmi12 scaled \magstep1 +\font\secsy=cmsy10 scaled \magstep2 +\def\sececsize{1440} + +% Subsection fonts (13.15pt). +\def\ssecnominalsize{13pt} +\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1} +\setfont\ssecit\itbshape{10}{1315}{OT1IT} +\setfont\ssecsl\slbshape{10}{1315}{OT1} +\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT} +\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT} +\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1} +\let\ssecbf\ssecrm +\setfont\ssecsc\scbshape{10}{1315}{OT1} +\font\sseci=cmmi12 scaled \magstephalf +\font\ssecsy=cmsy10 scaled 1315 +\def\ssececsize{1200} + +% Reduced fonts for @acro in text (10pt). +\def\reducednominalsize{10pt} +\setfont\reducedrm\rmshape{10}{1000}{OT1} +\setfont\reducedtt\ttshape{10}{1000}{OT1TT} +\setfont\reducedbf\bfshape{10}{1000}{OT1} +\setfont\reducedit\itshape{10}{1000}{OT1IT} +\setfont\reducedsl\slshape{10}{1000}{OT1} +\setfont\reducedsf\sfshape{10}{1000}{OT1} +\setfont\reducedsc\scshape{10}{1000}{OT1} +\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT} +\font\reducedi=cmmi10 +\font\reducedsy=cmsy10 +\def\reducedecsize{1000} + +\textleading = 13.2pt % line spacing for 11pt CM +\textfonts % reset the current fonts +\rm +} % end of 11pt text font size definitions, \definetextfontsizexi + + +% Definitions to make the main text be 10pt Computer Modern, with +% section, chapter, etc., sizes following suit. This is for the GNU +% Press printing of the Emacs 22 manual. Maybe other manuals in the +% future. Used with @smallbook, which sets the leading to 12pt. +% +\def\definetextfontsizex{% +% Text fonts (10pt). +\def\textnominalsize{10pt} +\edef\mainmagstep{1000} +\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} +\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} +\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} +\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} +\setfont\textsl\slshape{10}{\mainmagstep}{OT1} +\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} +\setfont\textsc\scshape{10}{\mainmagstep}{OT1} +\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} +\font\texti=cmmi10 scaled \mainmagstep +\font\textsy=cmsy10 scaled \mainmagstep +\def\textecsize{1000} + +% A few fonts for @defun names and args. +\setfont\defbf\bfshape{10}{\magstephalf}{OT1} +\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} +\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} +\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} + +% Fonts for indices, footnotes, small examples (9pt). +\def\smallnominalsize{9pt} +\setfont\smallrm\rmshape{9}{1000}{OT1} +\setfont\smalltt\ttshape{9}{1000}{OT1TT} +\setfont\smallbf\bfshape{10}{900}{OT1} +\setfont\smallit\itshape{9}{1000}{OT1IT} +\setfont\smallsl\slshape{9}{1000}{OT1} +\setfont\smallsf\sfshape{9}{1000}{OT1} +\setfont\smallsc\scshape{10}{900}{OT1} +\setfont\smallttsl\ttslshape{10}{900}{OT1TT} +\font\smalli=cmmi9 +\font\smallsy=cmsy9 +\def\smallecsize{0900} + +% Fonts for small examples (8pt). +\def\smallernominalsize{8pt} +\setfont\smallerrm\rmshape{8}{1000}{OT1} +\setfont\smallertt\ttshape{8}{1000}{OT1TT} +\setfont\smallerbf\bfshape{10}{800}{OT1} +\setfont\smallerit\itshape{8}{1000}{OT1IT} +\setfont\smallersl\slshape{8}{1000}{OT1} +\setfont\smallersf\sfshape{8}{1000}{OT1} +\setfont\smallersc\scshape{10}{800}{OT1} +\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} +\font\smalleri=cmmi8 +\font\smallersy=cmsy8 +\def\smallerecsize{0800} + +% Fonts for title page (20.4pt): +\def\titlenominalsize{20pt} +\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} +\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} +\setfont\titlesl\slbshape{10}{\magstep4}{OT1} +\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} +\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} +\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} +\let\titlebf=\titlerm +\setfont\titlesc\scbshape{10}{\magstep4}{OT1} +\font\titlei=cmmi12 scaled \magstep3 +\font\titlesy=cmsy10 scaled \magstep4 +\def\titleecsize{2074} + +% Chapter fonts (14.4pt). +\def\chapnominalsize{14pt} +\setfont\chaprm\rmbshape{12}{\magstep1}{OT1} +\setfont\chapit\itbshape{10}{\magstep2}{OT1IT} +\setfont\chapsl\slbshape{10}{\magstep2}{OT1} +\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT} +\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT} +\setfont\chapsf\sfbshape{12}{\magstep1}{OT1} +\let\chapbf\chaprm +\setfont\chapsc\scbshape{10}{\magstep2}{OT1} +\font\chapi=cmmi12 scaled \magstep1 +\font\chapsy=cmsy10 scaled \magstep2 +\def\chapecsize{1440} + +% Section fonts (12pt). +\def\secnominalsize{12pt} +\setfont\secrm\rmbshape{12}{1000}{OT1} +\setfont\secit\itbshape{10}{\magstep1}{OT1IT} +\setfont\secsl\slbshape{10}{\magstep1}{OT1} +\setfont\sectt\ttbshape{12}{1000}{OT1TT} +\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT} +\setfont\secsf\sfbshape{12}{1000}{OT1} +\let\secbf\secrm +\setfont\secsc\scbshape{10}{\magstep1}{OT1} +\font\seci=cmmi12 +\font\secsy=cmsy10 scaled \magstep1 +\def\sececsize{1200} + +% Subsection fonts (10pt). +\def\ssecnominalsize{10pt} +\setfont\ssecrm\rmbshape{10}{1000}{OT1} +\setfont\ssecit\itbshape{10}{1000}{OT1IT} +\setfont\ssecsl\slbshape{10}{1000}{OT1} +\setfont\ssectt\ttbshape{10}{1000}{OT1TT} +\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT} +\setfont\ssecsf\sfbshape{10}{1000}{OT1} +\let\ssecbf\ssecrm +\setfont\ssecsc\scbshape{10}{1000}{OT1} +\font\sseci=cmmi10 +\font\ssecsy=cmsy10 +\def\ssececsize{1000} + +% Reduced fonts for @acro in text (9pt). +\def\reducednominalsize{9pt} +\setfont\reducedrm\rmshape{9}{1000}{OT1} +\setfont\reducedtt\ttshape{9}{1000}{OT1TT} +\setfont\reducedbf\bfshape{10}{900}{OT1} +\setfont\reducedit\itshape{9}{1000}{OT1IT} +\setfont\reducedsl\slshape{9}{1000}{OT1} +\setfont\reducedsf\sfshape{9}{1000}{OT1} +\setfont\reducedsc\scshape{10}{900}{OT1} +\setfont\reducedttsl\ttslshape{10}{900}{OT1TT} +\font\reducedi=cmmi9 +\font\reducedsy=cmsy9 +\def\reducedecsize{0900} + +\divide\parskip by 2 % reduce space between paragraphs +\textleading = 12pt % line spacing for 10pt CM +\textfonts % reset the current fonts +\rm +} % end of 10pt text font size definitions, \definetextfontsizex + + +% We provide the user-level command +% @fonttextsize 10 +% (or 11) to redefine the text font size. pt is assumed. +% +\def\xiword{11} +\def\xword{10} +\def\xwordpt{10pt} +% +\parseargdef\fonttextsize{% + \def\textsizearg{#1}% + %\wlog{doing @fonttextsize \textsizearg}% + % + % Set \globaldefs so that documents can use this inside @tex, since + % makeinfo 4.8 does not support it, but we need it nonetheless. + % + \begingroup \globaldefs=1 + \ifx\textsizearg\xword \definetextfontsizex + \else \ifx\textsizearg\xiword \definetextfontsizexi + \else + \errhelp=\EMsimple + \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} + \fi\fi + \endgroup +} + + +% In order for the font changes to affect most math symbols and letters, +% we have to define the \textfont of the standard families. Since +% texinfo doesn't allow for producing subscripts and superscripts except +% in the main text, we don't bother to reset \scriptfont and +% \scriptscriptfont (which would also require loading a lot more fonts). +% +\def\resetmathfonts{% + \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy + \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf + \textfont\ttfam=\tentt \textfont\sffam=\tensf +} + +% The font-changing commands redefine the meanings of \tenSTYLE, instead +% of just \STYLE. We do this because \STYLE needs to also set the +% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire +% \tenSTYLE to set the current font. +% +% Each font-changing command also sets the names \lsize (one size lower) +% and \lllsize (three sizes lower). These relative commands are used in +% the LaTeX logo and acronyms. +% +% This all needs generalizing, badly. +% +\def\textfonts{% + \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl + \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc + \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy + \let\tenttsl=\textttsl + \def\curfontsize{text}% + \def\lsize{reduced}\def\lllsize{smaller}% + \resetmathfonts \setleading{\textleading}} +\def\titlefonts{% + \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl + \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc + \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy + \let\tenttsl=\titlettsl + \def\curfontsize{title}% + \def\lsize{chap}\def\lllsize{subsec}% + \resetmathfonts \setleading{27pt}} +\def\titlefont#1{{\titlefonts\rmisbold #1}} +\def\chapfonts{% + \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl + \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc + \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy + \let\tenttsl=\chapttsl + \def\curfontsize{chap}% + \def\lsize{sec}\def\lllsize{text}% + \resetmathfonts \setleading{19pt}} +\def\secfonts{% + \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl + \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc + \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy + \let\tenttsl=\secttsl + \def\curfontsize{sec}% + \def\lsize{subsec}\def\lllsize{reduced}% + \resetmathfonts \setleading{16pt}} +\def\subsecfonts{% + \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl + \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc + \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy + \let\tenttsl=\ssecttsl + \def\curfontsize{ssec}% + \def\lsize{text}\def\lllsize{small}% + \resetmathfonts \setleading{15pt}} +\let\subsubsecfonts = \subsecfonts +\def\reducedfonts{% + \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl + \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc + \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy + \let\tenttsl=\reducedttsl + \def\curfontsize{reduced}% + \def\lsize{small}\def\lllsize{smaller}% + \resetmathfonts \setleading{10.5pt}} +\def\smallfonts{% + \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl + \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc + \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy + \let\tenttsl=\smallttsl + \def\curfontsize{small}% + \def\lsize{smaller}\def\lllsize{smaller}% + \resetmathfonts \setleading{10.5pt}} +\def\smallerfonts{% + \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl + \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc + \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy + \let\tenttsl=\smallerttsl + \def\curfontsize{smaller}% + \def\lsize{smaller}\def\lllsize{smaller}% + \resetmathfonts \setleading{9.5pt}} + +% Fonts for short table of contents. +\setfont\shortcontrm\rmshape{12}{1000}{OT1} +\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 +\setfont\shortcontsl\slshape{12}{1000}{OT1} +\setfont\shortconttt\ttshape{12}{1000}{OT1TT} + +% Define these just so they can be easily changed for other fonts. +\def\angleleft{$\langle$} +\def\angleright{$\rangle$} + +% Set the fonts to use with the @small... environments. +\let\smallexamplefonts = \smallfonts + +% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample +% can fit this many characters: +% 8.5x11=86 smallbook=72 a4=90 a5=69 +% If we use \scriptfonts (8pt), then we can fit this many characters: +% 8.5x11=90+ smallbook=80 a4=90+ a5=77 +% For me, subjectively, the few extra characters that fit aren't worth +% the additional smallness of 8pt. So I'm making the default 9pt. +% +% By the way, for comparison, here's what fits with @example (10pt): +% 8.5x11=71 smallbook=60 a4=75 a5=58 +% --karl, 24jan03. + +% Set up the default fonts, so we can use them for creating boxes. +% +\definetextfontsizexi + + +\message{markup,} + +% Check if we are currently using a typewriter font. Since all the +% Computer Modern typewriter fonts have zero interword stretch (and +% shrink), and it is reasonable to expect all typewriter fonts to have +% this property, we can check that font parameter. +% +\def\ifmonospace{\ifdim\fontdimen3\font=0pt } + +% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will +% define and register \INITMACRO to be called on markup style changes. +% \INITMACRO can check \currentmarkupstyle for the innermost +% style and the set of \ifmarkupSTYLE switches for all styles +% currently in effect. +\newif\ifmarkupvar +\newif\ifmarkupsamp +\newif\ifmarkupkey +%\newif\ifmarkupfile % @file == @samp. +%\newif\ifmarkupoption % @option == @samp. +\newif\ifmarkupcode +\newif\ifmarkupkbd +%\newif\ifmarkupenv % @env == @code. +%\newif\ifmarkupcommand % @command == @code. +\newif\ifmarkuptex % @tex (and part of @math, for now). +\newif\ifmarkupexample +\newif\ifmarkupverb +\newif\ifmarkupverbatim + +\let\currentmarkupstyle\empty + +\def\setupmarkupstyle#1{% + \csname markup#1true\endcsname + \def\currentmarkupstyle{#1}% + \markupstylesetup +} + +\let\markupstylesetup\empty + +\def\defmarkupstylesetup#1{% + \expandafter\def\expandafter\markupstylesetup + \expandafter{\markupstylesetup #1}% + \def#1% +} + +% Markup style setup for left and right quotes. +\defmarkupstylesetup\markupsetuplq{% + \expandafter\let\expandafter \temp + \csname markupsetuplq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuplqdefault \else \temp \fi +} + +\defmarkupstylesetup\markupsetuprq{% + \expandafter\let\expandafter \temp + \csname markupsetuprq\currentmarkupstyle\endcsname + \ifx\temp\relax \markupsetuprqdefault \else \temp \fi +} + +{ +\catcode`\'=\active +\catcode`\`=\active + +\gdef\markupsetuplqdefault{\let`\lq} +\gdef\markupsetuprqdefault{\let'\rq} + +\gdef\markupsetcodequoteleft{\let`\codequoteleft} +\gdef\markupsetcodequoteright{\let'\codequoteright} +} + +\let\markupsetuplqcode \markupsetcodequoteleft +\let\markupsetuprqcode \markupsetcodequoteright +% +\let\markupsetuplqexample \markupsetcodequoteleft +\let\markupsetuprqexample \markupsetcodequoteright +% +\let\markupsetuplqkbd \markupsetcodequoteleft +\let\markupsetuprqkbd \markupsetcodequoteright +% +\let\markupsetuplqsamp \markupsetcodequoteleft +\let\markupsetuprqsamp \markupsetcodequoteright +% +\let\markupsetuplqverb \markupsetcodequoteleft +\let\markupsetuprqverb \markupsetcodequoteright +% +\let\markupsetuplqverbatim \markupsetcodequoteleft +\let\markupsetuprqverbatim \markupsetcodequoteright + +% Allow an option to not use regular directed right quote/apostrophe +% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). +% The undirected quote is ugly, so don't make it the default, but it +% works for pasting with more pdf viewers (at least evince), the +% lilypond developers report. xpdf does work with the regular 0x27. +% +\def\codequoteright{% + \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else \char'15 \fi + \else \char'15 \fi +} +% +% and a similar option for the left quote char vs. a grave accent. +% Modern fonts display ASCII 0x60 as a grave accent, so some people like +% the code environments to do likewise. +% +\def\codequoteleft{% + \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + % [Knuth] pp. 380,381,391 + % \relax disables Spanish ligatures ?` and !` of \tt font. + \relax`% + \else \char'22 \fi + \else \char'22 \fi +} + +% Commands to set the quote options. +% +\parseargdef\codequoteundirected{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequoteundirected\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% + \fi\fi +} +% +\parseargdef\codequotebacktick{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = t% + \else\ifx\temp\offword + \expandafter\let\csname SETtxicodequotebacktick\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% + \fi\fi +} + +% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. +\def\noligaturesquoteleft{\relax\lq} + +% Count depth in font-changes, for error checks +\newcount\fontdepth \fontdepth=0 + +% Font commands. + +% #1 is the font command (\sl or \it), #2 is the text to slant. +% If we are in a monospaced environment, however, 1) always use \ttsl, +% and 2) do not add an italic correction. +\def\dosmartslant#1#2{% + \ifusingtt + {{\ttsl #2}\let\next=\relax}% + {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% + \next +} +\def\smartslanted{\dosmartslant\sl} +\def\smartitalic{\dosmartslant\it} + +% Output an italic correction unless \next (presumed to be the following +% character) is such as not to need one. +\def\smartitaliccorrection{% + \ifx\next,% + \else\ifx\next-% + \else\ifx\next.% + \else\ptexslash + \fi\fi\fi + \aftersmartic +} + +% Unconditional use \ttsl, and no ic. @var is set to this for defuns. +\def\ttslanted#1{{\ttsl #1}} + +% @cite is like \smartslanted except unconditionally use \sl. We never want +% ttsl for book titles, do we? +\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} + +\def\aftersmartic{} +\def\var#1{% + \let\saveaftersmartic = \aftersmartic + \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% + \smartslanted{#1}% +} + +\let\i=\smartitalic +\let\slanted=\smartslanted +\let\dfn=\smartslanted +\let\emph=\smartitalic + +% Explicit font changes: @r, @sc, undocumented @ii. +\def\r#1{{\rm #1}} % roman font +\def\sc#1{{\smallcaps#1}} % smallcaps font +\def\ii#1{{\it #1}} % italic font + +% @b, explicit bold. Also @strong. +\def\b#1{{\bf #1}} +\let\strong=\b + +% @sansserif, explicit sans. +\def\sansserif#1{{\sf #1}} + +% We can't just use \exhyphenpenalty, because that only has effect at +% the end of a paragraph. Restore normal hyphenation at the end of the +% group within which \nohyphenation is presumably called. +% +\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} +\def\restorehyphenation{\hyphenchar\font = `- } + +% Set sfcode to normal for the chars that usually have another value. +% Can't use plain's \frenchspacing because it uses the `\x notation, and +% sometimes \x has an active definition that messes things up. +% +\catcode`@=11 + \def\plainfrenchspacing{% + \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m + \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m + \def\endofsentencespacefactor{1000}% for @. and friends + } + \def\plainnonfrenchspacing{% + \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 + \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 + \def\endofsentencespacefactor{3000}% for @. and friends + } +\catcode`@=\other +\def\endofsentencespacefactor{3000}% default + +% @t, explicit typewriter. +\def\t#1{% + {\tt \rawbackslash \plainfrenchspacing #1}% + \null +} + +% @samp. +\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} + +% @indicateurl is \samp, that is, with quotes. +\let\indicateurl=\samp + +% @code (and similar) prints in typewriter, but with spaces the same +% size as normal in the surrounding text, without hyphenation, etc. +% This is a subroutine for that. +\def\tclose#1{% + {% + % Change normal interword space to be same as for the current font. + \spaceskip = \fontdimen2\font + % + % Switch to typewriter. + \tt + % + % But `\ ' produces the large typewriter interword space. + \def\ {{\spaceskip = 0pt{} }}% + % + % Turn off hyphenation. + \nohyphenation + % + \rawbackslash + \plainfrenchspacing + #1% + }% + \null % reset spacefactor to 1000 +} + +% We *must* turn on hyphenation at `-' and `_' in @code. +% Otherwise, it is too hard to avoid overfull hboxes +% in the Emacs manual, the Library manual, etc. +% +% Unfortunately, TeX uses one parameter (\hyphenchar) to control +% both hyphenation at - and hyphenation within words. +% We must therefore turn them both off (\tclose does that) +% and arrange explicitly to hyphenate at a dash. +% -- rms. +{ + \catcode`\-=\active \catcode`\_=\active + \catcode`\'=\active \catcode`\`=\active + \global\let'=\rq \global\let`=\lq % default definitions + % + \global\def\code{\begingroup + \setupmarkupstyle{code}% + % The following should really be moved into \setupmarkupstyle handlers. + \catcode\dashChar=\active \catcode\underChar=\active + \ifallowcodebreaks + \let-\codedash + \let_\codeunder + \else + \let-\normaldash + \let_\realunder + \fi + \codex + } +} + +\def\codex #1{\tclose{#1}\endgroup} + +\def\normaldash{-} +\def\codedash{-\discretionary{}{}{}} +\def\codeunder{% + % this is all so @math{@code{var_name}+1} can work. In math mode, _ + % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) + % will therefore expand the active definition of _, which is us + % (inside @code that is), therefore an endless loop. + \ifusingtt{\ifmmode + \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_. + \else\normalunderscore \fi + \discretionary{}{}{}}% + {\_}% +} + +% An additional complication: the above will allow breaks after, e.g., +% each of the four underscores in __typeof__. This is bad. +% @allowcodebreaks provides a document-level way to turn breaking at - +% and _ on and off. +% +\newif\ifallowcodebreaks \allowcodebreakstrue + +\def\keywordtrue{true} +\def\keywordfalse{false} + +\parseargdef\allowcodebreaks{% + \def\txiarg{#1}% + \ifx\txiarg\keywordtrue + \allowcodebreakstrue + \else\ifx\txiarg\keywordfalse + \allowcodebreaksfalse + \else + \errhelp = \EMsimple + \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% + \fi\fi +} + +% For @command, @env, @file, @option quotes seem unnecessary, +% so use \code rather than \samp. +\let\command=\code +\let\env=\code +\let\file=\code +\let\option=\code + +% @uref (abbreviation for `urlref') takes an optional (comma-separated) +% second argument specifying the text to display and an optional third +% arg as text to display instead of (rather than in addition to) the url +% itself. First (mandatory) arg is the url. +% (This \urefnobreak definition isn't used now, leaving it for a while +% for comparison.) +\def\urefnobreak#1{\dourefnobreak #1,,,\finish} +\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \code{#1}% only url given, so show it + \fi + \fi + \endlink +\endgroup} + +% This \urefbreak definition is the active one. +\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} +\let\uref=\urefbreak +\def\dourefbreak#1{\urefbreakfinish #1,,,\finish} +\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example + \unsepspaces + \pdfurl{#1}% + \setbox0 = \hbox{\ignorespaces #3}% + \ifdim\wd0 > 0pt + \unhbox0 % third arg given, show only that + \else + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0 > 0pt + \ifpdf + \unhbox0 % PDF: 2nd arg given, show only it + \else + \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \fi + \else + \urefcode{#1}% only url given, so show it + \fi + \fi + \endlink +\endgroup} + +% Allow line breaks around only a few characters (only). +\def\urefcatcodes{% + \catcode\ampChar=\active \catcode\dotChar=\active + \catcode\hashChar=\active \catcode\questChar=\active + \catcode\slashChar=\active +} +{ + \urefcatcodes + % + \global\def\urefcode{\begingroup + \setupmarkupstyle{code}% + \urefcatcodes + \let&\urefcodeamp + \let.\urefcodedot + \let#\urefcodehash + \let?\urefcodequest + \let/\urefcodeslash + \codex + } + % + % By default, they are just regular characters. + \global\def&{\normalamp} + \global\def.{\normaldot} + \global\def#{\normalhash} + \global\def?{\normalquest} + \global\def/{\normalslash} +} + +% we put a little stretch before and after the breakable chars, to help +% line breaking of long url's. The unequal skips make look better in +% cmtt at least, especially for dots. +\def\urefprestretch{\urefprebreak \hskip0pt plus.13em } +\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } +% +\def\urefcodeamp{\urefprestretch \&\urefpoststretch} +\def\urefcodedot{\urefprestretch .\urefpoststretch} +\def\urefcodehash{\urefprestretch \#\urefpoststretch} +\def\urefcodequest{\urefprestretch ?\urefpoststretch} +\def\urefcodeslash{\futurelet\next\urefcodeslashfinish} +{ + \catcode`\/=\active + \global\def\urefcodeslashfinish{% + \urefprestretch \slashChar + % Allow line break only after the final / in a sequence of + % slashes, to avoid line break between the slashes in http://. + \ifx\next/\else \urefpoststretch \fi + } +} + +% One more complication: by default we'll break after the special +% characters, but some people like to break before the special chars, so +% allow that. Also allow no breaking at all, for manual control. +% +\parseargdef\urefbreakstyle{% + \def\txiarg{#1}% + \ifx\txiarg\wordnone + \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordbefore + \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} + \else\ifx\txiarg\wordafter + \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} + \else + \errhelp = \EMsimple + \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% + \fi\fi\fi +} +\def\wordafter{after} +\def\wordbefore{before} +\def\wordnone{none} + +\urefbreakstyle after + +% @url synonym for @uref, since that's how everyone uses it. +% +\let\url=\uref + +% rms does not like angle brackets --karl, 17may97. +% So now @email is just like @uref, unless we are pdf. +% +%\def\email#1{\angleleft{\tt #1}\angleright} +\ifpdf + \def\email#1{\doemail#1,,\finish} + \def\doemail#1,#2,#3\finish{\begingroup + \unsepspaces + \pdfurl{mailto:#1}% + \setbox0 = \hbox{\ignorespaces #2}% + \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi + \endlink + \endgroup} +\else + \let\email=\uref +\fi + +% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), +% `example' (@kbd uses ttsl only inside of @example and friends), +% or `code' (@kbd uses normal tty font always). +\parseargdef\kbdinputstyle{% + \def\txiarg{#1}% + \ifx\txiarg\worddistinct + \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% + \else\ifx\txiarg\wordexample + \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% + \else\ifx\txiarg\wordcode + \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% + \else + \errhelp = \EMsimple + \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% + \fi\fi\fi +} +\def\worddistinct{distinct} +\def\wordexample{example} +\def\wordcode{code} + +% Default is `distinct'. +\kbdinputstyle distinct + +% @kbd is like @code, except that if the argument is just one @key command, +% then @kbd has no effect. +\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} + +\def\xkey{\key} +\def\kbdsub#1#2#3\par{% + \def\one{#1}\def\three{#3}\def\threex{??}% + \ifx\one\xkey\ifx\threex\three \key{#2}% + \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi + \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi +} + +% definition of @key that produces a lozenge. Doesn't adjust to text size. +%\setfont\keyrm\rmshape{8}{1000}{OT1} +%\font\keysy=cmsy9 +%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% +% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% +% \vbox{\hrule\kern-0.4pt +% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% +% \kern-0.4pt\hrule}% +% \kern-.06em\raise0.4pt\hbox{\angleright}}}} + +% definition of @key with no lozenge. If the current font is already +% monospace, don't change it; that way, we respect @kbdinputstyle. But +% if it isn't monospace, then use \tt. +% +\def\key#1{{\setupmarkupstyle{key}% + \nohyphenation + \ifmonospace\else\tt\fi + #1}\null} + +% @clicksequence{File @click{} Open ...} +\def\clicksequence#1{\begingroup #1\endgroup} + +% @clickstyle @arrow (by default) +\parseargdef\clickstyle{\def\click{#1}} +\def\click{\arrow} + +% Typeset a dimension, e.g., `in' or `pt'. The only reason for the +% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. +% +\def\dmn#1{\thinspace #1} + +% @l was never documented to mean ``switch to the Lisp font'', +% and it is not used as such in any manual I can find. We need it for +% Polish suppressed-l. --karl, 22sep96. +%\def\l#1{{\li #1}\null} + +% @acronym for "FBI", "NATO", and the like. +% We print this one point size smaller, since it's intended for +% all-uppercase. +% +\def\acronym#1{\doacronym #1,,\finish} +\def\doacronym#1,#2,#3\finish{% + {\selectfonts\lsize #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% + \fi + \null % reset \spacefactor=1000 +} + +% @abbr for "Comput. J." and the like. +% No font change, but don't do end-of-sentence spacing. +% +\def\abbr#1{\doabbr #1,,\finish} +\def\doabbr#1,#2,#3\finish{% + {\plainfrenchspacing #1}% + \def\temp{#2}% + \ifx\temp\empty \else + \space ({\unsepspaces \ignorespaces \temp \unskip})% + \fi + \null % reset \spacefactor=1000 +} + +% @asis just yields its argument. Used with @table, for example. +% +\def\asis#1{#1} + +% @math outputs its argument in math mode. +% +% One complication: _ usually means subscripts, but it could also mean +% an actual _ character, as in @math{@var{some_variable} + 1}. So make +% _ active, and distinguish by seeing if the current family is \slfam, +% which is what @var uses. +{ + \catcode`\_ = \active + \gdef\mathunderscore{% + \catcode`\_=\active + \def_{\ifnum\fam=\slfam \_\else\sb\fi}% + } +} +% Another complication: we want \\ (and @\) to output a math (or tt) \. +% FYI, plain.tex uses \\ as a temporary control sequence (for no +% particular reason), but this is not advertised and we don't care. +% +% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. +\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} +% +\def\math{% + \tex + \mathunderscore + \let\\ = \mathbackslash + \mathactive + % make the texinfo accent commands work in math mode + \let\"=\ddot + \let\'=\acute + \let\==\bar + \let\^=\hat + \let\`=\grave + \let\u=\breve + \let\v=\check + \let\~=\tilde + \let\dotaccent=\dot + $\finishmath +} +\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. + +% Some active characters (such as <) are spaced differently in math. +% We have to reset their definitions in case the @math was an argument +% to a command which sets the catcodes (such as @item or @section). +% +{ + \catcode`^ = \active + \catcode`< = \active + \catcode`> = \active + \catcode`+ = \active + \catcode`' = \active + \gdef\mathactive{% + \let^ = \ptexhat + \let< = \ptexless + \let> = \ptexgtr + \let+ = \ptexplus + \let' = \ptexquoteright + } +} + +% ctrl is no longer a Texinfo command, but leave this definition for fun. +\def\ctrl #1{{\tt \rawbackslash \hat}#1} + +% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. +% Ignore unless FMTNAME == tex; then it is like @iftex and @tex, +% except specified as a normal braced arg, so no newlines to worry about. +% +\def\outfmtnametex{tex} +% +\long\def\inlinefmt#1{\doinlinefmt #1,\finish} +\long\def\doinlinefmt#1,#2,\finish{% + \def\inlinefmtname{#1}% + \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi +} +% For raw, must switch into @tex before parsing the argument, to avoid +% setting catcodes prematurely. Doing it this way means that, for +% example, @inlineraw{html, foo{bar} gets a parse error instead of being +% ignored. But this isn't important because if people want a literal +% *right* brace they would have to use a command anyway, so they may as +% well use a command to get a left brace too. We could re-use the +% delimiter character idea from \verb, but it seems like overkill. +% +\long\def\inlineraw{\tex \doinlineraw} +\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} +\def\doinlinerawtwo#1,#2,\finish{% + \def\inlinerawname{#1}% + \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi + \endgroup % close group opened by \tex. +} + + +\message{glyphs,} +% and logos. + +% @@ prints an @, as does @atchar{}. +\def\@{\char64 } +\let\atchar=\@ + +% @{ @} @lbracechar{} @rbracechar{} all generate brace characters. +% Unless we're in typewriter, use \ecfont because the CM text fonts do +% not have braces, and we don't want to switch into math. +\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} +\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} +\let\{=\mylbrace \let\lbracechar=\{ +\let\}=\myrbrace \let\rbracechar=\} +\begingroup + % Definitions to produce \{ and \} commands for indices, + % and @{ and @} for the aux/toc files. + \catcode`\{ = \other \catcode`\} = \other + \catcode`\[ = 1 \catcode`\] = 2 + \catcode`\! = 0 \catcode`\\ = \other + !gdef!lbracecmd[\{]% + !gdef!rbracecmd[\}]% + !gdef!lbraceatcmd[@{]% + !gdef!rbraceatcmd[@}]% +!endgroup + +% @comma{} to avoid , parsing problems. +\let\comma = , + +% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent +% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. +\let\, = \ptexc +\let\dotaccent = \ptexdot +\def\ringaccent#1{{\accent23 #1}} +\let\tieaccent = \ptext +\let\ubaraccent = \ptexb +\let\udotaccent = \d + +% Other special characters: @questiondown @exclamdown @ordf @ordm +% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. +\def\questiondown{?`} +\def\exclamdown{!`} +\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} +\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} + +% Dotless i and dotless j, used for accents. +\def\imacro{i} +\def\jmacro{j} +\def\dotless#1{% + \def\temp{#1}% + \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi + \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi + \else \errmessage{@dotless can be used only with i or j}% + \fi\fi +} + +% The \TeX{} logo, as in plain, but resetting the spacing so that a +% period following counts as ending a sentence. (Idea found in latex.) +% +\edef\TeX{\TeX \spacefactor=1000 } + +% @LaTeX{} logo. Not quite the same results as the definition in +% latex.ltx, since we use a different font for the raised A; it's most +% convenient for us to use an explicitly smaller font, rather than using +% the \scriptstyle font (since we don't reset \scriptstyle and +% \scriptscriptstyle). +% +\def\LaTeX{% + L\kern-.36em + {\setbox0=\hbox{T}% + \vbox to \ht0{\hbox{% + \ifx\textnominalsize\xwordpt + % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. + % Revert to plain's \scriptsize, which is 7pt. + \count255=\the\fam $\fam\count255 \scriptstyle A$% + \else + % For 11pt, we can use our lllsize. + \selectfonts\lllsize A% + \fi + }% + \vss + }}% + \kern-.15em + \TeX +} + +% Some math mode symbols. +\def\bullet{$\ptexbullet$} +\def\geq{\ifmmode \ge\else $\ge$\fi} +\def\leq{\ifmmode \le\else $\le$\fi} +\def\minus{\ifmmode -\else $-$\fi} + +% @dots{} outputs an ellipsis using the current font. +% We do .5em per period so that it has the same spacing in the cm +% typewriter fonts as three actual period characters; on the other hand, +% in other typewriter fonts three periods are wider than 1.5em. So do +% whichever is larger. +% +\def\dots{% + \leavevmode + \setbox0=\hbox{...}% get width of three periods + \ifdim\wd0 > 1.5em + \dimen0 = \wd0 + \else + \dimen0 = 1.5em + \fi + \hbox to \dimen0{% + \hskip 0pt plus.25fil + .\hskip 0pt plus1fil + .\hskip 0pt plus1fil + .\hskip 0pt plus.5fil + }% +} + +% @enddots{} is an end-of-sentence ellipsis. +% +\def\enddots{% + \dots + \spacefactor=\endofsentencespacefactor +} + +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. +% +% Since these characters are used in examples, they should be an even number of +% \tt widths. Each \tt character is 1en, so two makes it 1em. +% +\def\point{$\star$} +\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} +\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} +\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} +\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} +\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} + +% The @error{} command. +% Adapted from the TeXbook's \boxit. +% +\newbox\errorbox +% +{\tentt \global\dimen0 = 3em}% Width of the box. +\dimen2 = .55pt % Thickness of rules +% The text. (`r' is open on the right, `e' somewhat less so on the left.) +\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} +% +\setbox\errorbox=\hbox to \dimen0{\hfil + \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. + \advance\hsize by -2\dimen2 % Rules. + \vbox{% + \hrule height\dimen2 + \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. + \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. + \kern3pt\vrule width\dimen2}% Space to right. + \hrule height\dimen2} + \hfil} +% +\def\error{\leavevmode\lower.7ex\copy\errorbox} + +% @pounds{} is a sterling sign, which Knuth put in the CM italic font. +% +\def\pounds{{\it\$}} + +% @euro{} comes from a separate font, depending on the current style. +% We use the free feym* fonts from the eurosym package by Henrik +% Theiling, which support regular, slanted, bold and bold slanted (and +% "outlined" (blackboard board, sort of) versions, which we don't need). +% It is available from http://www.ctan.org/tex-archive/fonts/eurosym. +% +% Although only regular is the truly official Euro symbol, we ignore +% that. The Euro is designed to be slightly taller than the regular +% font height. +% +% feymr - regular +% feymo - slanted +% feybr - bold +% feybo - bold slanted +% +% There is no good (free) typewriter version, to my knowledge. +% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. +% Hmm. +% +% Also doesn't work in math. Do we need to do math with euro symbols? +% Hope not. +% +% +\def\euro{{\eurofont e}} +\def\eurofont{% + % We set the font at each command, rather than predefining it in + % \textfonts and the other font-switching commands, so that + % installations which never need the symbol don't have to have the + % font installed. + % + % There is only one designed size (nominal 10pt), so we always scale + % that to the current nominal size. + % + % By the way, simply using "at 1em" works for cmr10 and the like, but + % does not work for cmbx10 and other extended/shrunken fonts. + % + \def\eurosize{\csname\curfontsize nominalsize\endcsname}% + % + \ifx\curfontstyle\bfstylename + % bold: + \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize + \else + % regular: + \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize + \fi + \thiseurofont +} + +% Glyphs from the EC fonts. We don't use \let for the aliases, because +% sometimes we redefine the original macro, and the alias should reflect +% the redefinition. +% +% Use LaTeX names for the Icelandic letters. +\def\DH{{\ecfont \char"D0}} % Eth +\def\dh{{\ecfont \char"F0}} % eth +\def\TH{{\ecfont \char"DE}} % Thorn +\def\th{{\ecfont \char"FE}} % thorn +% +\def\guillemetleft{{\ecfont \char"13}} +\def\guillemotleft{\guillemetleft} +\def\guillemetright{{\ecfont \char"14}} +\def\guillemotright{\guillemetright} +\def\guilsinglleft{{\ecfont \char"0E}} +\def\guilsinglright{{\ecfont \char"0F}} +\def\quotedblbase{{\ecfont \char"12}} +\def\quotesinglbase{{\ecfont \char"0D}} +% +% This positioning is not perfect (see the ogonek LaTeX package), but +% we have the precomposed glyphs for the most common cases. We put the +% tests to use those glyphs in the single \ogonek macro so we have fewer +% dummy definitions to worry about for index entries, etc. +% +% ogonek is also used with other letters in Lithuanian (IOU), but using +% the precomposed glyphs for those is not so easy since they aren't in +% the same EC font. +\def\ogonek#1{{% + \def\temp{#1}% + \ifx\temp\macrocharA\Aogonek + \else\ifx\temp\macrochara\aogonek + \else\ifx\temp\macrocharE\Eogonek + \else\ifx\temp\macrochare\eogonek + \else + \ecfont \setbox0=\hbox{#1}% + \ifdim\ht0=1ex\accent"0C #1% + \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% + \fi + \fi\fi\fi\fi + }% +} +\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} +\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} +\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} +\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} +% +% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. +\def\ecfont{% + % We can't distinguish serif/sans and italic/slanted, but this + % is used for crude hacks anyway (like adding French and German + % quotes to documents typeset with CM, where we lose kerning), so + % hopefully nobody will notice/care. + \edef\ecsize{\csname\curfontsize ecsize\endcsname}% + \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% + \ifmonospace + % typewriter: + \font\thisecfont = ectt\ecsize \space at \nominalsize + \else + \ifx\curfontstyle\bfstylename + % bold: + \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \else + % regular: + \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \fi + \fi + \thisecfont +} + +% @registeredsymbol - R in a circle. The font for the R should really +% be smaller yet, but lllsize is the best we can do for now. +% Adapted from the plain.tex definition of \copyright. +% +\def\registeredsymbol{% + $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% + \hfil\crcr\Orb}}% + }$% +} + +% @textdegree - the normal degrees sign. +% +\def\textdegree{$^\circ$} + +% Laurent Siebenmann reports \Orb undefined with: +% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 +% so we'll define it if necessary. +% +\ifx\Orb\thisisundefined +\def\Orb{\mathhexbox20D} +\fi + +% Quotes. +\chardef\quotedblleft="5C +\chardef\quotedblright=`\" +\chardef\quoteleft=`\` +\chardef\quoteright=`\' + + +\message{page headings,} + +\newskip\titlepagetopglue \titlepagetopglue = 1.5in +\newskip\titlepagebottomglue \titlepagebottomglue = 2pc + +% First the title page. Must do @settitle before @titlepage. +\newif\ifseenauthor +\newif\iffinishedtitlepage + +% Do an implicit @contents or @shortcontents after @end titlepage if the +% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. +% +\newif\ifsetcontentsaftertitlepage + \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue +\newif\ifsetshortcontentsaftertitlepage + \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue + +\parseargdef\shorttitlepage{% + \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% + \endgroup\page\hbox{}\page} + +\envdef\titlepage{% + % Open one extra group, as we want to close it in the middle of \Etitlepage. + \begingroup + \parindent=0pt \textfonts + % Leave some space at the very top of the page. + \vglue\titlepagetopglue + % No rule at page bottom unless we print one at the top with @title. + \finishedtitlepagetrue + % + % Most title ``pages'' are actually two pages long, with space + % at the top of the second. We don't want the ragged left on the second. + \let\oldpage = \page + \def\page{% + \iffinishedtitlepage\else + \finishtitlepage + \fi + \let\page = \oldpage + \page + \null + }% +} + +\def\Etitlepage{% + \iffinishedtitlepage\else + \finishtitlepage + \fi + % It is important to do the page break before ending the group, + % because the headline and footline are only empty inside the group. + % If we use the new definition of \page, we always get a blank page + % after the title page, which we certainly don't want. + \oldpage + \endgroup + % + % Need this before the \...aftertitlepage checks so that if they are + % in effect the toc pages will come out with page numbers. + \HEADINGSon + % + % If they want short, they certainly want long too. + \ifsetshortcontentsaftertitlepage + \shortcontents + \contents + \global\let\shortcontents = \relax + \global\let\contents = \relax + \fi + % + \ifsetcontentsaftertitlepage + \contents + \global\let\contents = \relax + \global\let\shortcontents = \relax + \fi +} + +\def\finishtitlepage{% + \vskip4pt \hrule height 2pt width \hsize + \vskip\titlepagebottomglue + \finishedtitlepagetrue +} + +% Settings used for typesetting titles: no hyphenation, no indentation, +% don't worry much about spacing, ragged right. This should be used +% inside a \vbox, and fonts need to be set appropriately first. Because +% it is always used for titles, nothing else, we call \rmisbold. \par +% should be specified before the end of the \vbox, since a vbox is a group. +% +\def\raggedtitlesettings{% + \rmisbold + \hyphenpenalty=10000 + \parindent=0pt + \tolerance=5000 + \ptexraggedright +} + +% Macros to be used within @titlepage: + +\let\subtitlerm=\tenrm +\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} + +\parseargdef\title{% + \checkenv\titlepage + \vbox{\titlefonts \raggedtitlesettings #1\par}% + % print a rule at the page bottom also. + \finishedtitlepagefalse + \vskip4pt \hrule height 4pt width \hsize \vskip4pt +} + +\parseargdef\subtitle{% + \checkenv\titlepage + {\subtitlefont \rightline{#1}}% +} + +% @author should come last, but may come many times. +% It can also be used inside @quotation. +% +\parseargdef\author{% + \def\temp{\quotation}% + \ifx\thisenv\temp + \def\quotationauthor{#1}% printed in \Equotation. + \else + \checkenv\titlepage + \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi + {\secfonts\rmisbold \leftline{#1}}% + \fi +} + + +% Set up page headings and footings. + +\let\thispage=\folio + +\newtoks\evenheadline % headline on even pages +\newtoks\oddheadline % headline on odd pages +\newtoks\evenfootline % footline on even pages +\newtoks\oddfootline % footline on odd pages + +% Now make TeX use those variables +\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline + \else \the\evenheadline \fi}} +\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline + \else \the\evenfootline \fi}\HEADINGShook} +\let\HEADINGShook=\relax + +% Commands to set those variables. +% For example, this is what @headings on does +% @evenheading @thistitle|@thispage|@thischapter +% @oddheading @thischapter|@thispage|@thistitle +% @evenfooting @thisfile|| +% @oddfooting ||@thisfile + + +\def\evenheading{\parsearg\evenheadingxxx} +\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} +\def\evenheadingyyy #1\|#2\|#3\|#4\finish{% +\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + +\def\oddheading{\parsearg\oddheadingxxx} +\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} +\def\oddheadingyyy #1\|#2\|#3\|#4\finish{% +\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + +\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% + +\def\evenfooting{\parsearg\evenfootingxxx} +\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish} +\def\evenfootingyyy #1\|#2\|#3\|#4\finish{% +\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + +\def\oddfooting{\parsearg\oddfootingxxx} +\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish} +\def\oddfootingyyy #1\|#2\|#3\|#4\finish{% + \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}% + % + % Leave some space for the footline. Hopefully ok to assume + % @evenfooting will not be used by itself. + \global\advance\pageheight by -12pt + \global\advance\vsize by -12pt +} + +\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} + +% @evenheadingmarks top \thischapter <- chapter at the top of a page +% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page +% +% The same set of arguments for: +% +% @oddheadingmarks +% @evenfootingmarks +% @oddfootingmarks +% @everyheadingmarks +% @everyfootingmarks + +\def\evenheadingmarks{\headingmarks{even}{heading}} +\def\oddheadingmarks{\headingmarks{odd}{heading}} +\def\evenfootingmarks{\headingmarks{even}{footing}} +\def\oddfootingmarks{\headingmarks{odd}{footing}} +\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} + \headingmarks{odd}{heading}{#1} } +\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} + \headingmarks{odd}{footing}{#1} } +% #1 = even/odd, #2 = heading/footing, #3 = top/bottom. +\def\headingmarks#1#2#3 {% + \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname + \global\expandafter\let\csname get#1#2marks\endcsname \temp +} + +\everyheadingmarks bottom +\everyfootingmarks bottom + +% @headings double turns headings on for double-sided printing. +% @headings single turns headings on for single-sided printing. +% @headings off turns them off. +% @headings on same as @headings double, retained for compatibility. +% @headings after turns on double-sided headings after this page. +% @headings doubleafter turns on double-sided headings after this page. +% @headings singleafter turns on single-sided headings after this page. +% By default, they are off at the start of a document, +% and turned `on' after @end titlepage. + +\def\headings #1 {\csname HEADINGS#1\endcsname} + +\def\headingsoff{% non-global headings elimination + \evenheadline={\hfil}\evenfootline={\hfil}% + \oddheadline={\hfil}\oddfootline={\hfil}% +} + +\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting +\HEADINGSoff % it's the default + +% When we turn headings on, set the page number to 1. +% For double-sided printing, put current file name in lower left corner, +% chapter name on inside top of right hand pages, document +% title on inside top of left hand pages, and page numbers on outside top +% edge of all pages. +\def\HEADINGSdouble{% +\global\pageno=1 +\global\evenfootline={\hfil} +\global\oddfootline={\hfil} +\global\evenheadline={\line{\folio\hfil\thistitle}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chapoddpage +} +\let\contentsalignmacro = \chappager + +% For single-sided printing, chapter title goes across top left of page, +% page number on top right. +\def\HEADINGSsingle{% +\global\pageno=1 +\global\evenfootline={\hfil} +\global\oddfootline={\hfil} +\global\evenheadline={\line{\thischapter\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chappager +} +\def\HEADINGSon{\HEADINGSdouble} + +\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} +\let\HEADINGSdoubleafter=\HEADINGSafter +\def\HEADINGSdoublex{% +\global\evenfootline={\hfil} +\global\oddfootline={\hfil} +\global\evenheadline={\line{\folio\hfil\thistitle}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chapoddpage +} + +\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} +\def\HEADINGSsinglex{% +\global\evenfootline={\hfil} +\global\oddfootline={\hfil} +\global\evenheadline={\line{\thischapter\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\let\contentsalignmacro = \chappager +} + +% Subroutines used in generating headings +% This produces Day Month Year style of output. +% Only define if not already defined, in case a txi-??.tex file has set +% up a different format (e.g., txi-cs.tex does this). +\ifx\today\thisisundefined +\def\today{% + \number\day\space + \ifcase\month + \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr + \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug + \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec + \fi + \space\number\year} +\fi + +% @settitle line... specifies the title of the document, for headings. +% It generates no output of its own. +\def\thistitle{\putwordNoTitle} +\def\settitle{\parsearg{\gdef\thistitle}} + + +\message{tables,} +% Tables -- @table, @ftable, @vtable, @item(x). + +% default indentation of table text +\newdimen\tableindent \tableindent=.8in +% default indentation of @itemize and @enumerate text +\newdimen\itemindent \itemindent=.3in +% margin between end of table item and start of table text. +\newdimen\itemmargin \itemmargin=.1in + +% used internally for \itemindent minus \itemmargin +\newdimen\itemmax + +% Note @table, @ftable, and @vtable define @item, @itemx, etc., with +% these defs. +% They also define \itemindex +% to index the item name in whatever manner is desired (perhaps none). + +\newif\ifitemxneedsnegativevskip + +\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi} + +\def\internalBitem{\smallbreak \parsearg\itemzzz} +\def\internalBitemx{\itemxpar \parsearg\itemzzz} + +\def\itemzzz #1{\begingroup % + \advance\hsize by -\rightskip + \advance\hsize by -\tableindent + \setbox0=\hbox{\itemindicate{#1}}% + \itemindex{#1}% + \nobreak % This prevents a break before @itemx. + % + % If the item text does not fit in the space we have, put it on a line + % by itself, and do not allow a page break either before or after that + % line. We do not start a paragraph here because then if the next + % command is, e.g., @kindex, the whatsit would get put into the + % horizontal list on a line by itself, resulting in extra blank space. + \ifdim \wd0>\itemmax + % + % Make this a paragraph so we get the \parskip glue and wrapping, + % but leave it ragged-right. + \begingroup + \advance\leftskip by-\tableindent + \advance\hsize by\tableindent + \advance\rightskip by0pt plus1fil\relax + \leavevmode\unhbox0\par + \endgroup + % + % We're going to be starting a paragraph, but we don't want the + % \parskip glue -- logically it's part of the @item we just started. + \nobreak \vskip-\parskip + % + % Stop a page break at the \parskip glue coming up. However, if + % what follows is an environment such as @example, there will be no + % \parskip glue; then the negative vskip we just inserted would + % cause the example and the item to crash together. So we use this + % bizarre value of 10001 as a signal to \aboveenvbreak to insert + % \parskip glue after all. Section titles are handled this way also. + % + \penalty 10001 + \endgroup + \itemxneedsnegativevskipfalse + \else + % The item text fits into the space. Start a paragraph, so that the + % following text (if any) will end up on the same line. + \noindent + % Do this with kerns and \unhbox so that if there is a footnote in + % the item text, it can migrate to the main vertical list and + % eventually be printed. + \nobreak\kern-\tableindent + \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0 + \unhbox0 + \nobreak\kern\dimen0 + \endgroup + \itemxneedsnegativevskiptrue + \fi +} + +\def\item{\errmessage{@item while not in a list environment}} +\def\itemx{\errmessage{@itemx while not in a list environment}} + +% @table, @ftable, @vtable. +\envdef\table{% + \let\itemindex\gobble + \tablecheck{table}% +} +\envdef\ftable{% + \def\itemindex ##1{\doind {fn}{\code{##1}}}% + \tablecheck{ftable}% +} +\envdef\vtable{% + \def\itemindex ##1{\doind {vr}{\code{##1}}}% + \tablecheck{vtable}% +} +\def\tablecheck#1{% + \ifnum \the\catcode`\^^M=\active + \endgroup + \errmessage{This command won't work in this context; perhaps the problem is + that we are \inenvironment\thisenv}% + \def\next{\doignore{#1}}% + \else + \let\next\tablex + \fi + \next +} +\def\tablex#1{% + \def\itemindicate{#1}% + \parsearg\tabley +} +\def\tabley#1{% + {% + \makevalueexpandable + \edef\temp{\noexpand\tablez #1\space\space\space}% + \expandafter + }\temp \endtablez +} +\def\tablez #1 #2 #3 #4\endtablez{% + \aboveenvbreak + \ifnum 0#1>0 \advance \leftskip by #1\mil \fi + \ifnum 0#2>0 \tableindent=#2\mil \fi + \ifnum 0#3>0 \advance \rightskip by #3\mil \fi + \itemmax=\tableindent + \advance \itemmax by -\itemmargin + \advance \leftskip by \tableindent + \exdentamount=\tableindent + \parindent = 0pt + \parskip = \smallskipamount + \ifdim \parskip=0pt \parskip=2pt \fi + \let\item = \internalBitem + \let\itemx = \internalBitemx +} +\def\Etable{\endgraf\afterenvbreak} +\let\Eftable\Etable +\let\Evtable\Etable +\let\Eitemize\Etable +\let\Eenumerate\Etable + +% This is the counter used by @enumerate, which is really @itemize + +\newcount \itemno + +\envdef\itemize{\parsearg\doitemize} + +\def\doitemize#1{% + \aboveenvbreak + \itemmax=\itemindent + \advance\itemmax by -\itemmargin + \advance\leftskip by \itemindent + \exdentamount=\itemindent + \parindent=0pt + \parskip=\smallskipamount + \ifdim\parskip=0pt \parskip=2pt \fi + % + % Try typesetting the item mark that if the document erroneously says + % something like @itemize @samp (intending @table), there's an error + % right away at the @itemize. It's not the best error message in the + % world, but it's better than leaving it to the @item. This means if + % the user wants an empty mark, they have to say @w{} not just @w. + \def\itemcontents{#1}% + \setbox0 = \hbox{\itemcontents}% + % + % @itemize with no arg is equivalent to @itemize @bullet. + \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi + % + \let\item=\itemizeitem +} + +% Definition of @item while inside @itemize and @enumerate. +% +\def\itemizeitem{% + \advance\itemno by 1 % for enumerations + {\let\par=\endgraf \smallbreak}% reasonable place to break + {% + % If the document has an @itemize directly after a section title, a + % \nobreak will be last on the list, and \sectionheading will have + % done a \vskip-\parskip. In that case, we don't want to zero + % parskip, or the item text will crash with the heading. On the + % other hand, when there is normal text preceding the item (as there + % usually is), we do want to zero parskip, or there would be too much + % space. In that case, we won't have a \nobreak before. At least + % that's the theory. + \ifnum\lastpenalty<10000 \parskip=0in \fi + \noindent + \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% + % + \vadjust{\penalty 1200}}% not good to break after first line of item. + \flushcr +} + +% \splitoff TOKENS\endmark defines \first to be the first token in +% TOKENS, and \rest to be the remainder. +% +\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}% + +% Allow an optional argument of an uppercase letter, lowercase letter, +% or number, to specify the first label in the enumerated list. No +% argument is the same as `1'. +% +\envparseargdef\enumerate{\enumeratey #1 \endenumeratey} +\def\enumeratey #1 #2\endenumeratey{% + % If we were given no argument, pretend we were given `1'. + \def\thearg{#1}% + \ifx\thearg\empty \def\thearg{1}\fi + % + % Detect if the argument is a single token. If so, it might be a + % letter. Otherwise, the only valid thing it can be is a number. + % (We will always have one token, because of the test we just made. + % This is a good thing, since \splitoff doesn't work given nothing at + % all -- the first parameter is undelimited.) + \expandafter\splitoff\thearg\endmark + \ifx\rest\empty + % Only one token in the argument. It could still be anything. + % A ``lowercase letter'' is one whose \lccode is nonzero. + % An ``uppercase letter'' is one whose \lccode is both nonzero, and + % not equal to itself. + % Otherwise, we assume it's a number. + % + % We need the \relax at the end of the \ifnum lines to stop TeX from + % continuing to look for a <number>. + % + \ifnum\lccode\expandafter`\thearg=0\relax + \numericenumerate % a number (we hope) + \else + % It's a letter. + \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax + \lowercaseenumerate % lowercase letter + \else + \uppercaseenumerate % uppercase letter + \fi + \fi + \else + % Multiple tokens in the argument. We hope it's a number. + \numericenumerate + \fi +} + +% An @enumerate whose labels are integers. The starting integer is +% given in \thearg. +% +\def\numericenumerate{% + \itemno = \thearg + \startenumeration{\the\itemno}% +} + +% The starting (lowercase) letter is in \thearg. +\def\lowercaseenumerate{% + \itemno = \expandafter`\thearg + \startenumeration{% + % Be sure we're not beyond the end of the alphabet. + \ifnum\itemno=0 + \errmessage{No more lowercase letters in @enumerate; get a bigger + alphabet}% + \fi + \char\lccode\itemno + }% +} + +% The starting (uppercase) letter is in \thearg. +\def\uppercaseenumerate{% + \itemno = \expandafter`\thearg + \startenumeration{% + % Be sure we're not beyond the end of the alphabet. + \ifnum\itemno=0 + \errmessage{No more uppercase letters in @enumerate; get a bigger + alphabet} + \fi + \char\uccode\itemno + }% +} + +% Call \doitemize, adding a period to the first argument and supplying the +% common last two arguments. Also subtract one from the initial value in +% \itemno, since @item increments \itemno. +% +\def\startenumeration#1{% + \advance\itemno by -1 + \doitemize{#1.}\flushcr +} + +% @alphaenumerate and @capsenumerate are abbreviations for giving an arg +% to @enumerate. +% +\def\alphaenumerate{\enumerate{a}} +\def\capsenumerate{\enumerate{A}} +\def\Ealphaenumerate{\Eenumerate} +\def\Ecapsenumerate{\Eenumerate} + + +% @multitable macros +% Amy Hendrickson, 8/18/94, 3/6/96 +% +% @multitable ... @end multitable will make as many columns as desired. +% Contents of each column will wrap at width given in preamble. Width +% can be specified either with sample text given in a template line, +% or in percent of \hsize, the current width of text on page. + +% Table can continue over pages but will only break between lines. + +% To make preamble: +% +% Either define widths of columns in terms of percent of \hsize: +% @multitable @columnfractions .25 .3 .45 +% @item ... +% +% Numbers following @columnfractions are the percent of the total +% current hsize to be used for each column. You may use as many +% columns as desired. + + +% Or use a template: +% @multitable {Column 1 template} {Column 2 template} {Column 3 template} +% @item ... +% using the widest term desired in each column. + +% Each new table line starts with @item, each subsequent new column +% starts with @tab. Empty columns may be produced by supplying @tab's +% with nothing between them for as many times as empty columns are needed, +% ie, @tab@tab@tab will produce two empty columns. + +% @item, @tab do not need to be on their own lines, but it will not hurt +% if they are. + +% Sample multitable: + +% @multitable {Column 1 template} {Column 2 template} {Column 3 template} +% @item first col stuff @tab second col stuff @tab third col +% @item +% first col stuff +% @tab +% second col stuff +% @tab +% third col +% @item first col stuff @tab second col stuff +% @tab Many paragraphs of text may be used in any column. +% +% They will wrap at the width determined by the template. +% @item@tab@tab This will be in third column. +% @end multitable + +% Default dimensions may be reset by user. +% @multitableparskip is vertical space between paragraphs in table. +% @multitableparindent is paragraph indent in table. +% @multitablecolmargin is horizontal space to be left between columns. +% @multitablelinespace is space to leave between table items, baseline +% to baseline. +% 0pt means it depends on current normal line spacing. +% +\newskip\multitableparskip +\newskip\multitableparindent +\newdimen\multitablecolspace +\newskip\multitablelinespace +\multitableparskip=0pt +\multitableparindent=6pt +\multitablecolspace=12pt +\multitablelinespace=0pt + +% Macros used to set up halign preamble: +% +\let\endsetuptable\relax +\def\xendsetuptable{\endsetuptable} +\let\columnfractions\relax +\def\xcolumnfractions{\columnfractions} +\newif\ifsetpercent + +% #1 is the @columnfraction, usually a decimal number like .5, but might +% be just 1. We just use it, whatever it is. +% +\def\pickupwholefraction#1 {% + \global\advance\colcount by 1 + \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% + \setuptable +} + +\newcount\colcount +\def\setuptable#1{% + \def\firstarg{#1}% + \ifx\firstarg\xendsetuptable + \let\go = \relax + \else + \ifx\firstarg\xcolumnfractions + \global\setpercenttrue + \else + \ifsetpercent + \let\go\pickupwholefraction + \else + \global\advance\colcount by 1 + \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a + % separator; typically that is always in the input, anyway. + \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% + \fi + \fi + \ifx\go\pickupwholefraction + % Put the argument back for the \pickupwholefraction call, so + % we'll always have a period there to be parsed. + \def\go{\pickupwholefraction#1}% + \else + \let\go = \setuptable + \fi% + \fi + \go +} + +% multitable-only commands. +% +% @headitem starts a heading row, which we typeset in bold. +% Assignments have to be global since we are inside the implicit group +% of an alignment entry. \everycr resets \everytab so we don't have to +% undo it ourselves. +\def\headitemfont{\b}% for people to use in the template row; not changeable +\def\headitem{% + \checkenv\multitable + \crcr + \global\everytab={\bf}% can't use \headitemfont since the parsing differs + \the\everytab % for the first item +}% +% +% A \tab used to include \hskip1sp. But then the space in a template +% line is not enough. That is bad. So let's go back to just `&' until +% we again encounter the problem the 1sp was intended to solve. +% --karl, nathan@acm.org, 20apr99. +\def\tab{\checkenv\multitable &\the\everytab}% + +% @multitable ... @end multitable definitions: +% +\newtoks\everytab % insert after every tab. +% +\envdef\multitable{% + \vskip\parskip + \startsavinginserts + % + % @item within a multitable starts a normal row. + % We use \def instead of \let so that if one of the multitable entries + % contains an @itemize, we don't choke on the \item (seen as \crcr aka + % \endtemplate) expanding \doitemize. + \def\item{\crcr}% + % + \tolerance=9500 + \hbadness=9500 + \setmultitablespacing + \parskip=\multitableparskip + \parindent=\multitableparindent + \overfullrule=0pt + \global\colcount=0 + % + \everycr = {% + \noalign{% + \global\everytab={}% + \global\colcount=0 % Reset the column counter. + % Check for saved footnotes, etc. + \checkinserts + % Keeps underfull box messages off when table breaks over pages. + %\filbreak + % Maybe so, but it also creates really weird page breaks when the + % table breaks over pages. Wouldn't \vfil be better? Wait until the + % problem manifests itself, so it can be fixed for real --karl. + }% + }% + % + \parsearg\domultitable +} +\def\domultitable#1{% + % To parse everything between @multitable and @item: + \setuptable#1 \endsetuptable + % + % This preamble sets up a generic column definition, which will + % be used as many times as user calls for columns. + % \vtop will set a single line and will also let text wrap and + % continue for many paragraphs if desired. + \halign\bgroup &% + \global\advance\colcount by 1 + \multistrut + \vtop{% + % Use the current \colcount to find the correct column width: + \hsize=\expandafter\csname col\the\colcount\endcsname + % + % In order to keep entries from bumping into each other + % we will add a \leftskip of \multitablecolspace to all columns after + % the first one. + % + % If a template has been used, we will add \multitablecolspace + % to the width of each template entry. + % + % If the user has set preamble in terms of percent of \hsize we will + % use that dimension as the width of the column, and the \leftskip + % will keep entries from bumping into each other. Table will start at + % left margin and final column will justify at right margin. + % + % Make sure we don't inherit \rightskip from the outer environment. + \rightskip=0pt + \ifnum\colcount=1 + % The first column will be indented with the surrounding text. + \advance\hsize by\leftskip + \else + \ifsetpercent \else + % If user has not set preamble in terms of percent of \hsize + % we will advance \hsize by \multitablecolspace. + \advance\hsize by \multitablecolspace + \fi + % In either case we will make \leftskip=\multitablecolspace: + \leftskip=\multitablecolspace + \fi + % Ignoring space at the beginning and end avoids an occasional spurious + % blank line, when TeX decides to break the line at the space before the + % box from the multistrut, so the strut ends up on a line by itself. + % For example: + % @multitable @columnfractions .11 .89 + % @item @code{#} + % @tab Legal holiday which is valid in major parts of the whole country. + % Is automatically provided with highlighting sequences respectively + % marking characters. + \noindent\ignorespaces##\unskip\multistrut + }\cr +} +\def\Emultitable{% + \crcr + \egroup % end the \halign + \global\setpercentfalse +} + +\def\setmultitablespacing{% + \def\multistrut{\strut}% just use the standard line spacing + % + % Compute \multitablelinespace (if not defined by user) for use in + % \multitableparskip calculation. We used define \multistrut based on + % this, but (ironically) that caused the spacing to be off. + % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. +\ifdim\multitablelinespace=0pt +\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip +\global\advance\multitablelinespace by-\ht0 +\fi +% Test to see if parskip is larger than space between lines of +% table. If not, do nothing. +% If so, set to same dimension as multitablelinespace. +\ifdim\multitableparskip>\multitablelinespace +\global\multitableparskip=\multitablelinespace +\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller + % than skip between lines in the table. +\fi% +\ifdim\multitableparskip=0pt +\global\multitableparskip=\multitablelinespace +\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller + % than skip between lines in the table. +\fi} + + +\message{conditionals,} + +% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, +% @ifnotxml always succeed. They currently do nothing; we don't +% attempt to check whether the conditionals are properly nested. But we +% have to remember that they are conditionals, so that @end doesn't +% attempt to close an environment group. +% +\def\makecond#1{% + \expandafter\let\csname #1\endcsname = \relax + \expandafter\let\csname iscond.#1\endcsname = 1 +} +\makecond{iftex} +\makecond{ifnotdocbook} +\makecond{ifnothtml} +\makecond{ifnotinfo} +\makecond{ifnotplaintext} +\makecond{ifnotxml} + +% Ignore @ignore, @ifhtml, @ifinfo, and the like. +% +\def\direntry{\doignore{direntry}} +\def\documentdescription{\doignore{documentdescription}} +\def\docbook{\doignore{docbook}} +\def\html{\doignore{html}} +\def\ifdocbook{\doignore{ifdocbook}} +\def\ifhtml{\doignore{ifhtml}} +\def\ifinfo{\doignore{ifinfo}} +\def\ifnottex{\doignore{ifnottex}} +\def\ifplaintext{\doignore{ifplaintext}} +\def\ifxml{\doignore{ifxml}} +\def\ignore{\doignore{ignore}} +\def\menu{\doignore{menu}} +\def\xml{\doignore{xml}} + +% Ignore text until a line `@end #1', keeping track of nested conditionals. +% +% A count to remember the depth of nesting. +\newcount\doignorecount + +\def\doignore#1{\begingroup + % Scan in ``verbatim'' mode: + \obeylines + \catcode`\@ = \other + \catcode`\{ = \other + \catcode`\} = \other + % + % Make sure that spaces turn into tokens that match what \doignoretext wants. + \spaceisspace + % + % Count number of #1's that we've seen. + \doignorecount = 0 + % + % Swallow text until we reach the matching `@end #1'. + \dodoignore{#1}% +} + +{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. + \obeylines % + % + \gdef\dodoignore#1{% + % #1 contains the command name as a string, e.g., `ifinfo'. + % + % Define a command to find the next `@end #1'. + \long\def\doignoretext##1^^M@end #1{% + \doignoretextyyy##1^^M@#1\_STOP_}% + % + % And this command to find another #1 command, at the beginning of a + % line. (Otherwise, we would consider a line `@c @ifset', for + % example, to count as an @ifset for nesting.) + \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% + % + % And now expand that command. + \doignoretext ^^M% + }% +} + +\def\doignoreyyy#1{% + \def\temp{#1}% + \ifx\temp\empty % Nothing found. + \let\next\doignoretextzzz + \else % Found a nested condition, ... + \advance\doignorecount by 1 + \let\next\doignoretextyyy % ..., look for another. + % If we're here, #1 ends with ^^M\ifinfo (for example). + \fi + \next #1% the token \_STOP_ is present just after this macro. +} + +% We have to swallow the remaining "\_STOP_". +% +\def\doignoretextzzz#1{% + \ifnum\doignorecount = 0 % We have just found the outermost @end. + \let\next\enddoignore + \else % Still inside a nested condition. + \advance\doignorecount by -1 + \let\next\doignoretext % Look for the next @end. + \fi + \next +} + +% Finish off ignored text. +{ \obeylines% + % Ignore anything after the last `@end #1'; this matters in verbatim + % environments, where otherwise the newline after an ignored conditional + % would result in a blank line in the output. + \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% +} + + +% @set VAR sets the variable VAR to an empty value. +% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. +% +% Since we want to separate VAR from REST-OF-LINE (which might be +% empty), we can't just use \parsearg; we have to insert a space of our +% own to delimit the rest of the line, and then take it out again if we +% didn't need it. +% We rely on the fact that \parsearg sets \catcode`\ =10. +% +\parseargdef\set{\setyyy#1 \endsetyyy} +\def\setyyy#1 #2\endsetyyy{% + {% + \makevalueexpandable + \def\temp{#2}% + \edef\next{\gdef\makecsname{SET#1}}% + \ifx\temp\empty + \next{}% + \else + \setzzz#2\endsetzzz + \fi + }% +} +% Remove the trailing space \setxxx inserted. +\def\setzzz#1 \endsetzzz{\next{#1}} + +% @clear VAR clears (i.e., unsets) the variable VAR. +% +\parseargdef\clear{% + {% + \makevalueexpandable + \global\expandafter\let\csname SET#1\endcsname=\relax + }% +} + +% @value{foo} gets the text saved in variable foo. +\def\value{\begingroup\makevalueexpandable\valuexxx} +\def\valuexxx#1{\expandablevalue{#1}\endgroup} +{ + \catcode`\- = \active \catcode`\_ = \active + % + \gdef\makevalueexpandable{% + \let\value = \expandablevalue + % We don't want these characters active, ... + \catcode`\-=\other \catcode`\_=\other + % ..., but we might end up with active ones in the argument if + % we're called from @code, as @code{@value{foo-bar_}}, though. + % So \let them to their normal equivalents. + \let-\normaldash \let_\normalunderscore + } +} + +% We have this subroutine so that we can handle at least some @value's +% properly in indexes (we call \makevalueexpandable in \indexdummies). +% The command has to be fully expandable (if the variable is set), since +% the result winds up in the index file. This means that if the +% variable's value contains other Texinfo commands, it's almost certain +% it will fail (although perhaps we could fix that with sufficient work +% to do a one-level expansion on the result, instead of complete). +% +\def\expandablevalue#1{% + \expandafter\ifx\csname SET#1\endcsname\relax + {[No value for ``#1'']}% + \message{Variable `#1', used in @value, is not set.}% + \else + \csname SET#1\endcsname + \fi +} + +% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined +% with @set. +% +% To get special treatment of `@end ifset,' call \makeond and the redefine. +% +\makecond{ifset} +\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} +\def\doifset#1#2{% + {% + \makevalueexpandable + \let\next=\empty + \expandafter\ifx\csname SET#2\endcsname\relax + #1% If not set, redefine \next. + \fi + \expandafter + }\next +} +\def\ifsetfail{\doignore{ifset}} + +% @ifclear VAR ... @end executes the `...' iff VAR has never been +% defined with @set, or has been undefined with @clear. +% +% The `\else' inside the `\doifset' parameter is a trick to reuse the +% above code: if the variable is not set, do nothing, if it is set, +% then redefine \next to \ifclearfail. +% +\makecond{ifclear} +\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} +\def\ifclearfail{\doignore{ifclear}} + +% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written +% without the @) is in fact defined. We can only feasibly check at the +% TeX level, so something like `mathcode' is going to considered +% defined even though it is not a Texinfo command. +% +\makecond{ifcommanddefined} +\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} +% +\def\doifcmddefined#1#2{{% + \makevalueexpandable + \let\next=\empty + \expandafter\ifx\csname #2\endcsname\relax + #1% If not defined, \let\next as above. + \fi + \expandafter + }\next +} +\def\ifcmddefinedfail{\doignore{ifcommanddefined}} + +% @ifcommandnotdefined CMD ... handled similar to @ifclear above. +\makecond{ifcommandnotdefined} +\def\ifcommandnotdefined{% + \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} +\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} + +% Set the `txicommandconditionals' variable, so documents have a way to +% test if the @ifcommand...defined conditionals are available. +\set txicommandconditionals + +% @dircategory CATEGORY -- specify a category of the dir file +% which this file should belong to. Ignore this in TeX. +\let\dircategory=\comment + +% @defininfoenclose. +\let\definfoenclose=\comment + + +\message{indexing,} +% Index generation facilities + +% Define \newwrite to be identical to plain tex's \newwrite +% except not \outer, so it can be used within macros and \if's. +\edef\newwrite{\makecsname{ptexnewwrite}} + +% \newindex {foo} defines an index named foo. +% It automatically defines \fooindex such that +% \fooindex ...rest of line... puts an entry in the index foo. +% It also defines \fooindfile to be the number of the output channel for +% the file that accumulates this index. The file's extension is foo. +% The name of an index should be no more than 2 characters long +% for the sake of vms. +% +\def\newindex#1{% + \iflinks + \expandafter\newwrite \csname#1indfile\endcsname + \openout \csname#1indfile\endcsname \jobname.#1 % Open the file + \fi + \expandafter\xdef\csname#1index\endcsname{% % Define @#1index + \noexpand\doindex{#1}} +} + +% @defindex foo == \newindex{foo} +% +\def\defindex{\parsearg\newindex} + +% Define @defcodeindex, like @defindex except put all entries in @code. +% +\def\defcodeindex{\parsearg\newcodeindex} +% +\def\newcodeindex#1{% + \iflinks + \expandafter\newwrite \csname#1indfile\endcsname + \openout \csname#1indfile\endcsname \jobname.#1 + \fi + \expandafter\xdef\csname#1index\endcsname{% + \noexpand\docodeindex{#1}}% +} + + +% @synindex foo bar makes index foo feed into index bar. +% Do this instead of @defindex foo if you don't want it as a separate index. +% +% @syncodeindex foo bar similar, but put all entries made for index foo +% inside @code. +% +\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}} +\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}} + +% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), +% #3 the target index (bar). +\def\dosynindex#1#2#3{% + % Only do \closeout if we haven't already done it, else we'll end up + % closing the target index. + \expandafter \ifx\csname donesynindex#2\endcsname \relax + % The \closeout helps reduce unnecessary open files; the limit on the + % Acorn RISC OS is a mere 16 files. + \expandafter\closeout\csname#2indfile\endcsname + \expandafter\let\csname donesynindex#2\endcsname = 1 + \fi + % redefine \fooindfile: + \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname + \expandafter\let\csname#2indfile\endcsname=\temp + % redefine \fooindex: + \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% +} + +% Define \doindex, the driver for all \fooindex macros. +% Argument #1 is generated by the calling \fooindex macro, +% and it is "foo", the name of the index. + +% \doindex just uses \parsearg; it calls \doind for the actual work. +% This is because \doind is more useful to call from other macros. + +% There is also \dosubind {index}{topic}{subtopic} +% which makes an entry in a two-level index such as the operation index. + +\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer} +\def\singleindexer #1{\doind{\indexname}{#1}} + +% like the previous two, but they put @code around the argument. +\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer} +\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}} + +% Take care of Texinfo commands that can appear in an index entry. +% Since there are some commands we want to expand, and others we don't, +% we have to laboriously prevent expansion for those that we don't. +% +\def\indexdummies{% + \escapechar = `\\ % use backslash in output files. + \def\@{@}% change to @@ when we switch to @ as escape char in index files. + \def\ {\realbackslash\space }% + % + % Need these unexpandable (because we define \tt as a dummy) + % definitions when @{ or @} appear in index entry text. Also, more + % complicated, when \tex is in effect and \{ is a \delimiter again. + % We can't use \lbracecmd and \rbracecmd because texindex assumes + % braces and backslashes are used only as delimiters. Perhaps we + % should define @lbrace and @rbrace commands a la @comma. + \def\{{{\tt\char123}}% + \def\}{{\tt\char125}}% + % + % I don't entirely understand this, but when an index entry is + % generated from a macro call, the \endinput which \scanmacro inserts + % causes processing to be prematurely terminated. This is, + % apparently, because \indexsorttmp is fully expanded, and \endinput + % is an expandable command. The redefinition below makes \endinput + % disappear altogether for that purpose -- although logging shows that + % processing continues to some further point. On the other hand, it + % seems \endinput does not hurt in the printed index arg, since that + % is still getting written without apparent harm. + % + % Sample source (mac-idx3.tex, reported by Graham Percival to + % help-texinfo, 22may06): + % @macro funindex {WORD} + % @findex xyz + % @end macro + % ... + % @funindex commtest + % + % The above is not enough to reproduce the bug, but it gives the flavor. + % + % Sample whatsit resulting: + % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} + % + % So: + \let\endinput = \empty + % + % Do the redefinitions. + \commondummies +} + +% For the aux and toc files, @ is the escape character. So we want to +% redefine everything using @ as the escape character (instead of +% \realbackslash, still used for index files). When everything uses @, +% this will be simpler. +% +\def\atdummies{% + \def\@{@@}% + \def\ {@ }% + \let\{ = \lbraceatcmd + \let\} = \rbraceatcmd + % + % Do the redefinitions. + \commondummies + \otherbackslash +} + +% Called from \indexdummies and \atdummies. +% +\def\commondummies{% + % + % \definedummyword defines \#1 as \string\#1\space, thus effectively + % preventing its expansion. This is used only for control words, + % not control letters, because the \space would be incorrect for + % control characters, but is needed to separate the control word + % from whatever follows. + % + % For control letters, we have \definedummyletter, which omits the + % space. + % + % These can be used both for control words that take an argument and + % those that do not. If it is followed by {arg} in the input, then + % that will dutifully get written to the index (or wherever). + % + \def\definedummyword ##1{\def##1{\string##1\space}}% + \def\definedummyletter##1{\def##1{\string##1}}% + \let\definedummyaccent\definedummyletter + % + \commondummiesnofonts + % + \definedummyletter\_% + \definedummyletter\-% + % + % Non-English letters. + \definedummyword\AA + \definedummyword\AE + \definedummyword\DH + \definedummyword\L + \definedummyword\O + \definedummyword\OE + \definedummyword\TH + \definedummyword\aa + \definedummyword\ae + \definedummyword\dh + \definedummyword\exclamdown + \definedummyword\l + \definedummyword\o + \definedummyword\oe + \definedummyword\ordf + \definedummyword\ordm + \definedummyword\questiondown + \definedummyword\ss + \definedummyword\th + % + % Although these internal commands shouldn't show up, sometimes they do. + \definedummyword\bf + \definedummyword\gtr + \definedummyword\hat + \definedummyword\less + \definedummyword\sf + \definedummyword\sl + \definedummyword\tclose + \definedummyword\tt + % + \definedummyword\LaTeX + \definedummyword\TeX + % + % Assorted special characters. + \definedummyword\arrow + \definedummyword\bullet + \definedummyword\comma + \definedummyword\copyright + \definedummyword\registeredsymbol + \definedummyword\dots + \definedummyword\enddots + \definedummyword\entrybreak + \definedummyword\equiv + \definedummyword\error + \definedummyword\euro + \definedummyword\expansion + \definedummyword\geq + \definedummyword\guillemetleft + \definedummyword\guillemetright + \definedummyword\guilsinglleft + \definedummyword\guilsinglright + \definedummyword\lbracechar + \definedummyword\leq + \definedummyword\minus + \definedummyword\ogonek + \definedummyword\pounds + \definedummyword\point + \definedummyword\print + \definedummyword\quotedblbase + \definedummyword\quotedblleft + \definedummyword\quotedblright + \definedummyword\quoteleft + \definedummyword\quoteright + \definedummyword\quotesinglbase + \definedummyword\rbracechar + \definedummyword\result + \definedummyword\textdegree + % + % We want to disable all macros so that they are not expanded by \write. + \macrolist + % + \normalturnoffactive + % + % Handle some cases of @value -- where it does not contain any + % (non-fully-expandable) commands. + \makevalueexpandable +} + +% \commondummiesnofonts: common to \commondummies and \indexnofonts. +% +\def\commondummiesnofonts{% + % Control letters and accents. + \definedummyletter\!% + \definedummyaccent\"% + \definedummyaccent\'% + \definedummyletter\*% + \definedummyaccent\,% + \definedummyletter\.% + \definedummyletter\/% + \definedummyletter\:% + \definedummyaccent\=% + \definedummyletter\?% + \definedummyaccent\^% + \definedummyaccent\`% + \definedummyaccent\~% + \definedummyword\u + \definedummyword\v + \definedummyword\H + \definedummyword\dotaccent + \definedummyword\ogonek + \definedummyword\ringaccent + \definedummyword\tieaccent + \definedummyword\ubaraccent + \definedummyword\udotaccent + \definedummyword\dotless + % + % Texinfo font commands. + \definedummyword\b + \definedummyword\i + \definedummyword\r + \definedummyword\sansserif + \definedummyword\sc + \definedummyword\slanted + \definedummyword\t + % + % Commands that take arguments. + \definedummyword\abbr + \definedummyword\acronym + \definedummyword\anchor + \definedummyword\cite + \definedummyword\code + \definedummyword\command + \definedummyword\dfn + \definedummyword\dmn + \definedummyword\email + \definedummyword\emph + \definedummyword\env + \definedummyword\file + \definedummyword\image + \definedummyword\indicateurl + \definedummyword\inforef + \definedummyword\kbd + \definedummyword\key + \definedummyword\math + \definedummyword\option + \definedummyword\pxref + \definedummyword\ref + \definedummyword\samp + \definedummyword\strong + \definedummyword\tie + \definedummyword\uref + \definedummyword\url + \definedummyword\var + \definedummyword\verb + \definedummyword\w + \definedummyword\xref +} + +% \indexnofonts is used when outputting the strings to sort the index +% by, and when constructing control sequence names. It eliminates all +% control sequences and just writes whatever the best ASCII sort string +% would be for a given command (usually its argument). +% +\def\indexnofonts{% + % Accent commands should become @asis. + \def\definedummyaccent##1{\let##1\asis}% + % We can just ignore other control letters. + \def\definedummyletter##1{\let##1\empty}% + % All control words become @asis by default; overrides below. + \let\definedummyword\definedummyaccent + % + \commondummiesnofonts + % + % Don't no-op \tt, since it isn't a user-level command + % and is used in the definitions of the active chars like <, >, |, etc. + % Likewise with the other plain tex font commands. + %\let\tt=\asis + % + \def\ { }% + \def\@{@}% + \def\_{\normalunderscore}% + \def\-{}% @- shouldn't affect sorting + % + % Unfortunately, texindex is not prepared to handle braces in the + % content at all. So for index sorting, we map @{ and @} to strings + % starting with |, since that ASCII character is between ASCII { and }. + \def\{{|a}% + \def\lbracechar{|a}% + % + \def\}{|b}% + \def\rbracechar{|b}% + % + % Non-English letters. + \def\AA{AA}% + \def\AE{AE}% + \def\DH{DZZ}% + \def\L{L}% + \def\OE{OE}% + \def\O{O}% + \def\TH{ZZZ}% + \def\aa{aa}% + \def\ae{ae}% + \def\dh{dzz}% + \def\exclamdown{!}% + \def\l{l}% + \def\oe{oe}% + \def\ordf{a}% + \def\ordm{o}% + \def\o{o}% + \def\questiondown{?}% + \def\ss{ss}% + \def\th{zzz}% + % + \def\LaTeX{LaTeX}% + \def\TeX{TeX}% + % + % Assorted special characters. + % (The following {} will end up in the sort string, but that's ok.) + \def\arrow{->}% + \def\bullet{bullet}% + \def\comma{,}% + \def\copyright{copyright}% + \def\dots{...}% + \def\enddots{...}% + \def\equiv{==}% + \def\error{error}% + \def\euro{euro}% + \def\expansion{==>}% + \def\geq{>=}% + \def\guillemetleft{<<}% + \def\guillemetright{>>}% + \def\guilsinglleft{<}% + \def\guilsinglright{>}% + \def\leq{<=}% + \def\minus{-}% + \def\point{.}% + \def\pounds{pounds}% + \def\print{-|}% + \def\quotedblbase{"}% + \def\quotedblleft{"}% + \def\quotedblright{"}% + \def\quoteleft{`}% + \def\quoteright{'}% + \def\quotesinglbase{,}% + \def\registeredsymbol{R}% + \def\result{=>}% + \def\textdegree{o}% + % + \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax + \else \indexlquoteignore \fi + % + % We need to get rid of all macros, leaving only the arguments (if present). + % Of course this is not nearly correct, but it is the best we can do for now. + % makeinfo does not expand macros in the argument to @deffn, which ends up + % writing an index entry, and texindex isn't prepared for an index sort entry + % that starts with \. + % + % Since macro invocations are followed by braces, we can just redefine them + % to take a single TeX argument. The case of a macro invocation that + % goes to end-of-line is not handled. + % + \macrolist +} + +% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us +% ignore left quotes in the sort term. +{\catcode`\`=\active + \gdef\indexlquoteignore{\let`=\empty}} + +\let\indexbackslash=0 %overridden during \printindex. +\let\SETmarginindex=\relax % put index entries in margin (undocumented)? + +% Most index entries go through here, but \dosubind is the general case. +% #1 is the index name, #2 is the entry text. +\def\doind#1#2{\dosubind{#1}{#2}{}} + +% Workhorse for all \fooindexes. +% #1 is name of index, #2 is stuff to put there, #3 is subentry -- +% empty if called from \doind, as we usually are (the main exception +% is with most defuns, which call us directly). +% +\def\dosubind#1#2#3{% + \iflinks + {% + % Store the main index entry text (including the third arg). + \toks0 = {#2}% + % If third arg is present, precede it with a space. + \def\thirdarg{#3}% + \ifx\thirdarg\empty \else + \toks0 = \expandafter{\the\toks0 \space #3}% + \fi + % + \edef\writeto{\csname#1indfile\endcsname}% + % + \safewhatsit\dosubindwrite + }% + \fi +} + +% Write the entry in \toks0 to the index file: +% +\def\dosubindwrite{% + % Put the index entry in the margin if desired. + \ifx\SETmarginindex\relax\else + \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% + \fi + % + % Remember, we are within a group. + \indexdummies % Must do this here, since \bf, etc expand at this stage + \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now + % so it will be output as is; and it will print as backslash. + % + % Process the index entry with all font commands turned off, to + % get the string to sort by. + {\indexnofonts + \edef\temp{\the\toks0}% need full expansion + \xdef\indexsorttmp{\temp}% + }% + % + % Set up the complete index entry, with both the sort key and + % the original text, including any font commands. We write + % three arguments to \entry to the .?? file (four in the + % subentry case), texindex reduces to two when writing the .??s + % sorted result. + \edef\temp{% + \write\writeto{% + \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}% + }% + \temp +} + +% Take care of unwanted page breaks/skips around a whatsit: +% +% If a skip is the last thing on the list now, preserve it +% by backing up by \lastskip, doing the \write, then inserting +% the skip again. Otherwise, the whatsit generated by the +% \write or \pdfdest will make \lastskip zero. The result is that +% sequences like this: +% @end defun +% @tindex whatever +% @defun ... +% will have extra space inserted, because the \medbreak in the +% start of the @defun won't see the skip inserted by the @end of +% the previous defun. +% +% But don't do any of this if we're not in vertical mode. We +% don't want to do a \vskip and prematurely end a paragraph. +% +% Avoid page breaks due to these extra skips, too. +% +% But wait, there is a catch there: +% We'll have to check whether \lastskip is zero skip. \ifdim is not +% sufficient for this purpose, as it ignores stretch and shrink parts +% of the skip. The only way seems to be to check the textual +% representation of the skip. +% +% The following is almost like \def\zeroskipmacro{0.0pt} except that +% the ``p'' and ``t'' characters have catcode \other, not 11 (letter). +% +\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} +% +\newskip\whatsitskip +\newcount\whatsitpenalty +% +% ..., ready, GO: +% +\def\safewhatsit#1{\ifhmode + #1% + \else + % \lastskip and \lastpenalty cannot both be nonzero simultaneously. + \whatsitskip = \lastskip + \edef\lastskipmacro{\the\lastskip}% + \whatsitpenalty = \lastpenalty + % + % If \lastskip is nonzero, that means the last item was a + % skip. And since a skip is discardable, that means this + % -\whatsitskip glue we're inserting is preceded by a + % non-discardable item, therefore it is not a potential + % breakpoint, therefore no \nobreak needed. + \ifx\lastskipmacro\zeroskipmacro + \else + \vskip-\whatsitskip + \fi + % + #1% + % + \ifx\lastskipmacro\zeroskipmacro + % If \lastskip was zero, perhaps the last item was a penalty, and + % perhaps it was >=10000, e.g., a \nobreak. In that case, we want + % to re-insert the same penalty (values >10000 are used for various + % signals); since we just inserted a non-discardable item, any + % following glue (such as a \parskip) would be a breakpoint. For example: + % @deffn deffn-whatever + % @vindex index-whatever + % Description. + % would allow a break between the index-whatever whatsit + % and the "Description." paragraph. + \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi + \else + % On the other hand, if we had a nonzero \lastskip, + % this make-up glue would be preceded by a non-discardable item + % (the whatsit from the \write), so we must insert a \nobreak. + \nobreak\vskip\whatsitskip + \fi +\fi} + +% The index entry written in the file actually looks like +% \entry {sortstring}{page}{topic} +% or +% \entry {sortstring}{page}{topic}{subtopic} +% The texindex program reads in these files and writes files +% containing these kinds of lines: +% \initial {c} +% before the first topic whose initial is c +% \entry {topic}{pagelist} +% for a topic that is used without subtopics +% \primary {topic} +% for the beginning of a topic that is used with subtopics +% \secondary {subtopic}{pagelist} +% for each subtopic. + +% Define the user-accessible indexing commands +% @findex, @vindex, @kindex, @cindex. + +\def\findex {\fnindex} +\def\kindex {\kyindex} +\def\cindex {\cpindex} +\def\vindex {\vrindex} +\def\tindex {\tpindex} +\def\pindex {\pgindex} + +\def\cindexsub {\begingroup\obeylines\cindexsub} +{\obeylines % +\gdef\cindexsub "#1" #2^^M{\endgroup % +\dosubind{cp}{#2}{#1}}} + +% Define the macros used in formatting output of the sorted index material. + +% @printindex causes a particular index (the ??s file) to get printed. +% It does not print any chapter heading (usually an @unnumbered). +% +\parseargdef\printindex{\begingroup + \dobreak \chapheadingskip{10000}% + % + \smallfonts \rm + \tolerance = 9500 + \plainfrenchspacing + \everypar = {}% don't want the \kern\-parindent from indentation suppression. + % + % See if the index file exists and is nonempty. + % Change catcode of @ here so that if the index file contains + % \initial {@} + % as its first line, TeX doesn't complain about mismatched braces + % (because it thinks @} is a control sequence). + \catcode`\@ = 11 + \openin 1 \jobname.#1s + \ifeof 1 + % \enddoublecolumns gets confused if there is no text in the index, + % and it loses the chapter title and the aux file entries for the + % index. The easiest way to prevent this problem is to make sure + % there is some text. + \putwordIndexNonexistent + \else + % + % If the index file exists but is empty, then \openin leaves \ifeof + % false. We have to make TeX try to read something from the file, so + % it can discover if there is anything in it. + \read 1 to \temp + \ifeof 1 + \putwordIndexIsEmpty + \else + % Index files are almost Texinfo source, but we use \ as the escape + % character. It would be better to use @, but that's too big a change + % to make right now. + \def\indexbackslash{\backslashcurfont}% + \catcode`\\ = 0 + \escapechar = `\\ + \begindoublecolumns + \input \jobname.#1s + \enddoublecolumns + \fi + \fi + \closein 1 +\endgroup} + +% These macros are used by the sorted index file itself. +% Change them to control the appearance of the index. + +\def\initial#1{{% + % Some minor font changes for the special characters. + \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt + % + % Remove any glue we may have, we'll be inserting our own. + \removelastskip + % + % We like breaks before the index initials, so insert a bonus. + \nobreak + \vskip 0pt plus 3\baselineskip + \penalty 0 + \vskip 0pt plus -3\baselineskip + % + % Typeset the initial. Making this add up to a whole number of + % baselineskips increases the chance of the dots lining up from column + % to column. It still won't often be perfect, because of the stretch + % we need before each entry, but it's better. + % + % No shrink because it confuses \balancecolumns. + \vskip 1.67\baselineskip plus .5\baselineskip + \leftline{\secbf #1}% + % Do our best not to break after the initial. + \nobreak + \vskip .33\baselineskip plus .1\baselineskip +}} + +% \entry typesets a paragraph consisting of the text (#1), dot leaders, and +% then page number (#2) flushed to the right margin. It is used for index +% and table of contents entries. The paragraph is indented by \leftskip. +% +% A straightforward implementation would start like this: +% \def\entry#1#2{... +% But this freezes the catcodes in the argument, and can cause problems to +% @code, which sets - active. This problem was fixed by a kludge--- +% ``-'' was active throughout whole index, but this isn't really right. +% The right solution is to prevent \entry from swallowing the whole text. +% --kasal, 21nov03 +\def\entry{% + \begingroup + % + % Start a new paragraph if necessary, so our assignments below can't + % affect previous text. + \par + % + % Do not fill out the last line with white space. + \parfillskip = 0in + % + % No extra space above this paragraph. + \parskip = 0in + % + % Do not prefer a separate line ending with a hyphen to fewer lines. + \finalhyphendemerits = 0 + % + % \hangindent is only relevant when the entry text and page number + % don't both fit on one line. In that case, bob suggests starting the + % dots pretty far over on the line. Unfortunately, a large + % indentation looks wrong when the entry text itself is broken across + % lines. So we use a small indentation and put up with long leaders. + % + % \hangafter is reset to 1 (which is the value we want) at the start + % of each paragraph, so we need not do anything with that. + \hangindent = 2em + % + % When the entry text needs to be broken, just fill out the first line + % with blank space. + \rightskip = 0pt plus1fil + % + % A bit of stretch before each entry for the benefit of balancing + % columns. + \vskip 0pt plus1pt + % + % When reading the text of entry, convert explicit line breaks + % from @* into spaces. The user might give these in long section + % titles, for instance. + \def\*{\unskip\space\ignorespaces}% + \def\entrybreak{\hfil\break}% + % + % Swallow the left brace of the text (first parameter): + \afterassignment\doentry + \let\temp = +} +\def\entrybreak{\unskip\space\ignorespaces}% +\def\doentry{% + \bgroup % Instead of the swallowed brace. + \noindent + \aftergroup\finishentry + % And now comes the text of the entry. +} +\def\finishentry#1{% + % #1 is the page number. + % + % The following is kludged to not output a line of dots in the index if + % there are no page numbers. The next person who breaks this will be + % cursed by a Unix daemon. + \setbox\boxA = \hbox{#1}% + \ifdim\wd\boxA = 0pt + \ % + \else + % + % If we must, put the page number on a line of its own, and fill out + % this line with blank space. (The \hfil is overwhelmed with the + % fill leaders glue in \indexdotfill if the page number does fit.) + \hfil\penalty50 + \null\nobreak\indexdotfill % Have leaders before the page number. + % + % The `\ ' here is removed by the implicit \unskip that TeX does as + % part of (the primitive) \par. Without it, a spurious underfull + % \hbox ensues. + \ifpdf + \pdfgettoks#1.% + \ \the\toksA + \else + \ #1% + \fi + \fi + \par + \endgroup +} + +% Like plain.tex's \dotfill, except uses up at least 1 em. +\def\indexdotfill{\cleaders + \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} + +\def\primary #1{\line{#1\hfil}} + +\newskip\secondaryindent \secondaryindent=0.5cm +\def\secondary#1#2{{% + \parfillskip=0in + \parskip=0in + \hangindent=1in + \hangafter=1 + \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill + \ifpdf + \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. + \else + #2 + \fi + \par +}} + +% Define two-column mode, which we use to typeset indexes. +% Adapted from the TeXbook, page 416, which is to say, +% the manmac.tex format used to print the TeXbook itself. +\catcode`\@=11 + +\newbox\partialpage +\newdimen\doublecolumnhsize + +\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns + % Grab any single-column material above us. + \output = {% + % + % Here is a possibility not foreseen in manmac: if we accumulate a + % whole lot of material, we might end up calling this \output + % routine twice in a row (see the doublecol-lose test, which is + % essentially a couple of indexes with @setchapternewpage off). In + % that case we just ship out what is in \partialpage with the normal + % output routine. Generally, \partialpage will be empty when this + % runs and this will be a no-op. See the indexspread.tex test case. + \ifvoid\partialpage \else + \onepageout{\pagecontents\partialpage}% + \fi + % + \global\setbox\partialpage = \vbox{% + % Unvbox the main output page. + \unvbox\PAGE + \kern-\topskip \kern\baselineskip + }% + }% + \eject % run that output routine to set \partialpage + % + % Use the double-column output routine for subsequent pages. + \output = {\doublecolumnout}% + % + % Change the page size parameters. We could do this once outside this + % routine, in each of @smallbook, @afourpaper, and the default 8.5x11 + % format, but then we repeat the same computation. Repeating a couple + % of assignments once per index is clearly meaningless for the + % execution time, so we may as well do it in one place. + % + % First we halve the line length, less a little for the gutter between + % the columns. We compute the gutter based on the line length, so it + % changes automatically with the paper format. The magic constant + % below is chosen so that the gutter has the same value (well, +-<1pt) + % as it did when we hard-coded it. + % + % We put the result in a separate register, \doublecolumhsize, so we + % can restore it in \pagesofar, after \hsize itself has (potentially) + % been clobbered. + % + \doublecolumnhsize = \hsize + \advance\doublecolumnhsize by -.04154\hsize + \divide\doublecolumnhsize by 2 + \hsize = \doublecolumnhsize + % + % Double the \vsize as well. (We don't need a separate register here, + % since nobody clobbers \vsize.) + \vsize = 2\vsize +} + +% The double-column output routine for all double-column pages except +% the last. +% +\def\doublecolumnout{% + \splittopskip=\topskip \splitmaxdepth=\maxdepth + % Get the available space for the double columns -- the normal + % (undoubled) page height minus any material left over from the + % previous page. + \dimen@ = \vsize + \divide\dimen@ by 2 + \advance\dimen@ by -\ht\partialpage + % + % box0 will be the left-hand column, box2 the right. + \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ + \onepageout\pagesofar + \unvbox255 + \penalty\outputpenalty +} +% +% Re-output the contents of the output page -- any previous material, +% followed by the two boxes we just split, in box0 and box2. +\def\pagesofar{% + \unvbox\partialpage + % + \hsize = \doublecolumnhsize + \wd0=\hsize \wd2=\hsize + \hbox to\pagewidth{\box0\hfil\box2}% +} +% +% All done with double columns. +\def\enddoublecolumns{% + % The following penalty ensures that the page builder is exercised + % _before_ we change the output routine. This is necessary in the + % following situation: + % + % The last section of the index consists only of a single entry. + % Before this section, \pagetotal is less than \pagegoal, so no + % break occurs before the last section starts. However, the last + % section, consisting of \initial and the single \entry, does not + % fit on the page and has to be broken off. Without the following + % penalty the page builder will not be exercised until \eject + % below, and by that time we'll already have changed the output + % routine to the \balancecolumns version, so the next-to-last + % double-column page will be processed with \balancecolumns, which + % is wrong: The two columns will go to the main vertical list, with + % the broken-off section in the recent contributions. As soon as + % the output routine finishes, TeX starts reconsidering the page + % break. The two columns and the broken-off section both fit on the + % page, because the two columns now take up only half of the page + % goal. When TeX sees \eject from below which follows the final + % section, it invokes the new output routine that we've set after + % \balancecolumns below; \onepageout will try to fit the two columns + % and the final section into the vbox of \pageheight (see + % \pagebody), causing an overfull box. + % + % Note that glue won't work here, because glue does not exercise the + % page builder, unlike penalties (see The TeXbook, pp. 280-281). + \penalty0 + % + \output = {% + % Split the last of the double-column material. Leave it on the + % current page, no automatic page break. + \balancecolumns + % + % If we end up splitting too much material for the current page, + % though, there will be another page break right after this \output + % invocation ends. Having called \balancecolumns once, we do not + % want to call it again. Therefore, reset \output to its normal + % definition right away. (We hope \balancecolumns will never be + % called on to balance too much material, but if it is, this makes + % the output somewhat more palatable.) + \global\output = {\onepageout{\pagecontents\PAGE}}% + }% + \eject + \endgroup % started in \begindoublecolumns + % + % \pagegoal was set to the doubled \vsize above, since we restarted + % the current page. We're now back to normal single-column + % typesetting, so reset \pagegoal to the normal \vsize (after the + % \endgroup where \vsize got restored). + \pagegoal = \vsize +} +% +% Called at the end of the double column material. +\def\balancecolumns{% + \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. + \dimen@ = \ht0 + \advance\dimen@ by \topskip + \advance\dimen@ by-\baselineskip + \divide\dimen@ by 2 % target to split to + %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}% + \splittopskip = \topskip + % Loop until we get a decent breakpoint. + {% + \vbadness = 10000 + \loop + \global\setbox3 = \copy0 + \global\setbox1 = \vsplit3 to \dimen@ + \ifdim\ht3>\dimen@ + \global\advance\dimen@ by 1pt + \repeat + }% + %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}% + \setbox0=\vbox to\dimen@{\unvbox1}% + \setbox2=\vbox to\dimen@{\unvbox3}% + % + \pagesofar +} +\catcode`\@ = \other + + +\message{sectioning,} +% Chapters, sections, etc. + +% Let's start with @part. +\outer\parseargdef\part{\partzzz{#1}} +\def\partzzz#1{% + \chapoddpage + \null + \vskip.3\vsize % move it down on the page a bit + \begingroup + \noindent \titlefonts\rmisbold #1\par % the text + \let\lastnode=\empty % no node to associate with + \writetocentry{part}{#1}{}% but put it in the toc + \headingsoff % no headline or footline on the part page + \chapoddpage + \endgroup +} + +% \unnumberedno is an oxymoron. But we count the unnumbered +% sections so that we can refer to them unambiguously in the pdf +% outlines by their "section number". We avoid collisions with chapter +% numbers by starting them at 10000. (If a document ever has 10000 +% chapters, we're in trouble anyway, I'm sure.) +\newcount\unnumberedno \unnumberedno = 10000 +\newcount\chapno +\newcount\secno \secno=0 +\newcount\subsecno \subsecno=0 +\newcount\subsubsecno \subsubsecno=0 + +% This counter is funny since it counts through charcodes of letters A, B, ... +\newcount\appendixno \appendixno = `\@ +% +% \def\appendixletter{\char\the\appendixno} +% We do the following ugly conditional instead of the above simple +% construct for the sake of pdftex, which needs the actual +% letter in the expansion, not just typeset. +% +\def\appendixletter{% + \ifnum\appendixno=`A A% + \else\ifnum\appendixno=`B B% + \else\ifnum\appendixno=`C C% + \else\ifnum\appendixno=`D D% + \else\ifnum\appendixno=`E E% + \else\ifnum\appendixno=`F F% + \else\ifnum\appendixno=`G G% + \else\ifnum\appendixno=`H H% + \else\ifnum\appendixno=`I I% + \else\ifnum\appendixno=`J J% + \else\ifnum\appendixno=`K K% + \else\ifnum\appendixno=`L L% + \else\ifnum\appendixno=`M M% + \else\ifnum\appendixno=`N N% + \else\ifnum\appendixno=`O O% + \else\ifnum\appendixno=`P P% + \else\ifnum\appendixno=`Q Q% + \else\ifnum\appendixno=`R R% + \else\ifnum\appendixno=`S S% + \else\ifnum\appendixno=`T T% + \else\ifnum\appendixno=`U U% + \else\ifnum\appendixno=`V V% + \else\ifnum\appendixno=`W W% + \else\ifnum\appendixno=`X X% + \else\ifnum\appendixno=`Y Y% + \else\ifnum\appendixno=`Z Z% + % The \the is necessary, despite appearances, because \appendixletter is + % expanded while writing the .toc file. \char\appendixno is not + % expandable, thus it is written literally, thus all appendixes come out + % with the same letter (or @) in the toc without it. + \else\char\the\appendixno + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} + +% Each @chapter defines these (using marks) as the number+name, number +% and name of the chapter. Page headings and footings can use +% these. @section does likewise. +\def\thischapter{} +\def\thischapternum{} +\def\thischaptername{} +\def\thissection{} +\def\thissectionnum{} +\def\thissectionname{} + +\newcount\absseclevel % used to calculate proper heading level +\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count + +% @raisesections: treat @section as chapter, @subsection as section, etc. +\def\raisesections{\global\advance\secbase by -1} +\let\up=\raisesections % original BFox name + +% @lowersections: treat @chapter as section, @section as subsection, etc. +\def\lowersections{\global\advance\secbase by 1} +\let\down=\lowersections % original BFox name + +% we only have subsub. +\chardef\maxseclevel = 3 +% +% A numbered section within an unnumbered changes to unnumbered too. +% To achieve this, remember the "biggest" unnum. sec. we are currently in: +\chardef\unnlevel = \maxseclevel +% +% Trace whether the current chapter is an appendix or not: +% \chapheadtype is "N" or "A", unnumbered chapters are ignored. +\def\chapheadtype{N} + +% Choose a heading macro +% #1 is heading type +% #2 is heading level +% #3 is text for heading +\def\genhead#1#2#3{% + % Compute the abs. sec. level: + \absseclevel=#2 + \advance\absseclevel by \secbase + % Make sure \absseclevel doesn't fall outside the range: + \ifnum \absseclevel < 0 + \absseclevel = 0 + \else + \ifnum \absseclevel > 3 + \absseclevel = 3 + \fi + \fi + % The heading type: + \def\headtype{#1}% + \if \headtype U% + \ifnum \absseclevel < \unnlevel + \chardef\unnlevel = \absseclevel + \fi + \else + % Check for appendix sections: + \ifnum \absseclevel = 0 + \edef\chapheadtype{\headtype}% + \else + \if \headtype A\if \chapheadtype N% + \errmessage{@appendix... within a non-appendix chapter}% + \fi\fi + \fi + % Check for numbered within unnumbered: + \ifnum \absseclevel > \unnlevel + \def\headtype{U}% + \else + \chardef\unnlevel = 3 + \fi + \fi + % Now print the heading: + \if \headtype U% + \ifcase\absseclevel + \unnumberedzzz{#3}% + \or \unnumberedseczzz{#3}% + \or \unnumberedsubseczzz{#3}% + \or \unnumberedsubsubseczzz{#3}% + \fi + \else + \if \headtype A% + \ifcase\absseclevel + \appendixzzz{#3}% + \or \appendixsectionzzz{#3}% + \or \appendixsubseczzz{#3}% + \or \appendixsubsubseczzz{#3}% + \fi + \else + \ifcase\absseclevel + \chapterzzz{#3}% + \or \seczzz{#3}% + \or \numberedsubseczzz{#3}% + \or \numberedsubsubseczzz{#3}% + \fi + \fi + \fi + \suppressfirstparagraphindent +} + +% an interface: +\def\numhead{\genhead N} +\def\apphead{\genhead A} +\def\unnmhead{\genhead U} + +% @chapter, @appendix, @unnumbered. Increment top-level counter, reset +% all lower-level sectioning counters to zero. +% +% Also set \chaplevelprefix, which we prepend to @float sequence numbers +% (e.g., figures), q.v. By default (before any chapter), that is empty. +\let\chaplevelprefix = \empty +% +\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz +\def\chapterzzz#1{% + % section resetting is \global in case the chapter is in a group, such + % as an @include file. + \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 + \global\advance\chapno by 1 + % + % Used for \float. + \gdef\chaplevelprefix{\the\chapno.}% + \resetallfloatnos + % + % \putwordChapter can contain complex things in translations. + \toks0=\expandafter{\putwordChapter}% + \message{\the\toks0 \space \the\chapno}% + % + % Write the actual heading. + \chapmacro{#1}{Ynumbered}{\the\chapno}% + % + % So @section and the like are numbered underneath this chapter. + \global\let\section = \numberedsec + \global\let\subsection = \numberedsubsec + \global\let\subsubsection = \numberedsubsubsec +} + +\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz +% +\def\appendixzzz#1{% + \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 + \global\advance\appendixno by 1 + \gdef\chaplevelprefix{\appendixletter.}% + \resetallfloatnos + % + % \putwordAppendix can contain complex things in translations. + \toks0=\expandafter{\putwordAppendix}% + \message{\the\toks0 \space \appendixletter}% + % + \chapmacro{#1}{Yappendix}{\appendixletter}% + % + \global\let\section = \appendixsec + \global\let\subsection = \appendixsubsec + \global\let\subsubsection = \appendixsubsubsec +} + +% normally unnmhead0 calls unnumberedzzz: +\outer\parseargdef\unnumbered{\unnmhead0{#1}} +\def\unnumberedzzz#1{% + \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 + \global\advance\unnumberedno by 1 + % + % Since an unnumbered has no number, no prefix for figures. + \global\let\chaplevelprefix = \empty + \resetallfloatnos + % + % This used to be simply \message{#1}, but TeX fully expands the + % argument to \message. Therefore, if #1 contained @-commands, TeX + % expanded them. For example, in `@unnumbered The @cite{Book}', TeX + % expanded @cite (which turns out to cause errors because \cite is meant + % to be executed, not expanded). + % + % Anyway, we don't want the fully-expanded definition of @cite to appear + % as a result of the \message, we just want `@cite' itself. We use + % \the<toks register> to achieve this: TeX expands \the<toks> only once, + % simply yielding the contents of <toks register>. (We also do this for + % the toc entries.) + \toks0 = {#1}% + \message{(\the\toks0)}% + % + \chapmacro{#1}{Ynothing}{\the\unnumberedno}% + % + \global\let\section = \unnumberedsec + \global\let\subsection = \unnumberedsubsec + \global\let\subsubsection = \unnumberedsubsubsec +} + +% @centerchap is like @unnumbered, but the heading is centered. +\outer\parseargdef\centerchap{% + % Well, we could do the following in a group, but that would break + % an assumption that \chapmacro is called at the outermost level. + % Thus we are safer this way: --kasal, 24feb04 + \let\centerparametersmaybe = \centerparameters + \unnmhead0{#1}% + \let\centerparametersmaybe = \relax +} + +% @top is like @unnumbered. +\let\top\unnumbered + +% Sections. +% +\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz +\def\seczzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 + \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% +} + +% normally calls appendixsectionzzz: +\outer\parseargdef\appendixsection{\apphead1{#1}} +\def\appendixsectionzzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 + \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% +} +\let\appendixsec\appendixsection + +% normally calls unnumberedseczzz: +\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} +\def\unnumberedseczzz#1{% + \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 + \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% +} + +% Subsections. +% +% normally calls numberedsubseczzz: +\outer\parseargdef\numberedsubsec{\numhead2{#1}} +\def\numberedsubseczzz#1{% + \global\subsubsecno=0 \global\advance\subsecno by 1 + \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% +} + +% normally calls appendixsubseczzz: +\outer\parseargdef\appendixsubsec{\apphead2{#1}} +\def\appendixsubseczzz#1{% + \global\subsubsecno=0 \global\advance\subsecno by 1 + \sectionheading{#1}{subsec}{Yappendix}% + {\appendixletter.\the\secno.\the\subsecno}% +} + +% normally calls unnumberedsubseczzz: +\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} +\def\unnumberedsubseczzz#1{% + \global\subsubsecno=0 \global\advance\subsecno by 1 + \sectionheading{#1}{subsec}{Ynothing}% + {\the\unnumberedno.\the\secno.\the\subsecno}% +} + +% Subsubsections. +% +% normally numberedsubsubseczzz: +\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} +\def\numberedsubsubseczzz#1{% + \global\advance\subsubsecno by 1 + \sectionheading{#1}{subsubsec}{Ynumbered}% + {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% +} + +% normally appendixsubsubseczzz: +\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} +\def\appendixsubsubseczzz#1{% + \global\advance\subsubsecno by 1 + \sectionheading{#1}{subsubsec}{Yappendix}% + {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% +} + +% normally unnumberedsubsubseczzz: +\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} +\def\unnumberedsubsubseczzz#1{% + \global\advance\subsubsecno by 1 + \sectionheading{#1}{subsubsec}{Ynothing}% + {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% +} + +% These macros control what the section commands do, according +% to what kind of chapter we are in (ordinary, appendix, or unnumbered). +% Define them by default for a numbered chapter. +\let\section = \numberedsec +\let\subsection = \numberedsubsec +\let\subsubsection = \numberedsubsubsec + +% Define @majorheading, @heading and @subheading + +\def\majorheading{% + {\advance\chapheadingskip by 10pt \chapbreak }% + \parsearg\chapheadingzzz +} + +\def\chapheading{\chapbreak \parsearg\chapheadingzzz} +\def\chapheadingzzz#1{% + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip \nobreak + \suppressfirstparagraphindent +} + +% @heading, @subheading, @subsubheading. +\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} +\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} +\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} + \suppressfirstparagraphindent} + +% These macros generate a chapter, section, etc. heading only +% (including whitespace, linebreaking, etc. around it), +% given all the information in convenient, parsed form. + +% Args are the skip and penalty (usually negative) +\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} + +% Parameter controlling skip before chapter headings (if needed) +\newskip\chapheadingskip + +% Define plain chapter starts, and page on/off switching for it. +\def\chapbreak{\dobreak \chapheadingskip {-4000}} +\def\chappager{\par\vfill\supereject} +% Because \domark is called before \chapoddpage, the filler page will +% get the headings for the next chapter, which is wrong. But we don't +% care -- we just disable all headings on the filler page. +\def\chapoddpage{% + \chappager + \ifodd\pageno \else + \begingroup + \headingsoff + \null + \chappager + \endgroup + \fi +} + +\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} + +\def\CHAPPAGoff{% +\global\let\contentsalignmacro = \chappager +\global\let\pchapsepmacro=\chapbreak +\global\let\pagealignmacro=\chappager} + +\def\CHAPPAGon{% +\global\let\contentsalignmacro = \chappager +\global\let\pchapsepmacro=\chappager +\global\let\pagealignmacro=\chappager +\global\def\HEADINGSon{\HEADINGSsingle}} + +\def\CHAPPAGodd{% +\global\let\contentsalignmacro = \chapoddpage +\global\let\pchapsepmacro=\chapoddpage +\global\let\pagealignmacro=\chapoddpage +\global\def\HEADINGSon{\HEADINGSdouble}} + +\CHAPPAGon + +% Chapter opening. +% +% #1 is the text, #2 is the section type (Ynumbered, Ynothing, +% Yappendix, Yomitfromtoc), #3 the chapter number. +% +% To test against our argument. +\def\Ynothingkeyword{Ynothing} +\def\Yomitfromtockeyword{Yomitfromtoc} +\def\Yappendixkeyword{Yappendix} +% +\def\chapmacro#1#2#3{% + % Insert the first mark before the heading break (see notes for \domark). + \let\prevchapterdefs=\lastchapterdefs + \let\prevsectiondefs=\lastsectiondefs + \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% + \gdef\thissection{}}% + % + \def\temptype{#2}% + \ifx\temptype\Ynothingkeyword + \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{\thischaptername}}% + \else\ifx\temptype\Yomitfromtockeyword + \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\thischapter{}}% + \else\ifx\temptype\Yappendixkeyword + \toks0={#1}% + \xdef\lastchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\appendixletter}% + % \noexpand\putwordAppendix avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} + \noexpand\thischapternum: + \noexpand\thischaptername}% + }% + \else + \toks0={#1}% + \xdef\lastchapterdefs{% + \gdef\noexpand\thischaptername{\the\toks0}% + \gdef\noexpand\thischapternum{\the\chapno}% + % \noexpand\putwordChapter avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thischapter{\noexpand\putwordChapter{} + \noexpand\thischapternum: + \noexpand\thischaptername}% + }% + \fi\fi\fi + % + % Output the mark. Pass it through \safewhatsit, to take care of + % the preceding space. + \safewhatsit\domark + % + % Insert the chapter heading break. + \pchapsepmacro + % + % Now the second mark, after the heading break. No break points + % between here and the heading. + \let\prevchapterdefs=\lastchapterdefs + \let\prevsectiondefs=\lastsectiondefs + \domark + % + {% + \chapfonts \rmisbold + % + % Have to define \lastsection before calling \donoderef, because the + % xref code eventually uses it. On the other hand, it has to be called + % after \pchapsepmacro, or the headline will change too soon. + \gdef\lastsection{#1}% + % + % Only insert the separating space if we have a chapter/appendix + % number, and don't print the unnumbered ``number''. + \ifx\temptype\Ynothingkeyword + \setbox0 = \hbox{}% + \def\toctype{unnchap}% + \else\ifx\temptype\Yomitfromtockeyword + \setbox0 = \hbox{}% contents like unnumbered, but no toc entry + \def\toctype{omit}% + \else\ifx\temptype\Yappendixkeyword + \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% + \def\toctype{app}% + \else + \setbox0 = \hbox{#3\enspace}% + \def\toctype{numchap}% + \fi\fi\fi + % + % Write the toc entry for this chapter. Must come before the + % \donoderef, because we include the current node name in the toc + % entry, and \donoderef resets it to empty. + \writetocentry{\toctype}{#1}{#3}% + % + % For pdftex, we have to write out the node definition (aka, make + % the pdfdest) after any page break, but before the actual text has + % been typeset. If the destination for the pdf outline is after the + % text, then jumping from the outline may wind up with the text not + % being visible, for instance under high magnification. + \donoderef{#2}% + % + % Typeset the actual heading. + \nobreak % Avoid page breaks at the interline glue. + \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe + \unhbox0 #1\par}% + }% + \nobreak\bigskip % no page break after a chapter title + \nobreak +} + +% @centerchap -- centered and unnumbered. +\let\centerparametersmaybe = \relax +\def\centerparameters{% + \advance\rightskip by 3\rightskip + \leftskip = \rightskip + \parfillskip = 0pt +} + + +% I don't think this chapter style is supported any more, so I'm not +% updating it with the new noderef stuff. We'll see. --karl, 11aug03. +% +\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} +% +\def\unnchfopen #1{% + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings #1\par}% + \nobreak\bigskip\nobreak +} +\def\chfopen #1#2{\chapoddpage {\chapfonts +\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% +\par\penalty 5000 % +} +\def\centerchfopen #1{% + \chapoddpage + \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% + \nobreak\bigskip \nobreak +} +\def\CHAPFopen{% + \global\let\chapmacro=\chfopen + \global\let\centerchapmacro=\centerchfopen} + + +% Section titles. These macros combine the section number parts and +% call the generic \sectionheading to do the printing. +% +\newskip\secheadingskip +\def\secheadingbreak{\dobreak \secheadingskip{-1000}} + +% Subsection titles. +\newskip\subsecheadingskip +\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} + +% Subsubsection titles. +\def\subsubsecheadingskip{\subsecheadingskip} +\def\subsubsecheadingbreak{\subsecheadingbreak} + + +% Print any size, any type, section title. +% +% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is +% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the +% section number. +% +\def\seckeyword{sec} +% +\def\sectionheading#1#2#3#4{% + {% + \checkenv{}% should not be in an environment. + % + % Switch to the right set of fonts. + \csname #2fonts\endcsname \rmisbold + % + \def\sectionlevel{#2}% + \def\temptype{#3}% + % + % Insert first mark before the heading break (see notes for \domark). + \let\prevsectiondefs=\lastsectiondefs + \ifx\temptype\Ynothingkeyword + \ifx\sectionlevel\seckeyword + \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% + \gdef\thissection{\thissectionname}}% + \fi + \else\ifx\temptype\Yomitfromtockeyword + % Don't redefine \thissection. + \else\ifx\temptype\Yappendixkeyword + \ifx\sectionlevel\seckeyword + \toks0={#1}% + \xdef\lastsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: + \noexpand\thissectionname}% + }% + \fi + \else + \ifx\sectionlevel\seckeyword + \toks0={#1}% + \xdef\lastsectiondefs{% + \gdef\noexpand\thissectionname{\the\toks0}% + \gdef\noexpand\thissectionnum{#4}% + % \noexpand\putwordSection avoids expanding indigestible + % commands in some of the translations. + \gdef\noexpand\thissection{\noexpand\putwordSection{} + \noexpand\thissectionnum: + \noexpand\thissectionname}% + }% + \fi + \fi\fi\fi + % + % Go into vertical mode. Usually we'll already be there, but we + % don't want the following whatsit to end up in a preceding paragraph + % if the document didn't happen to have a blank line. + \par + % + % Output the mark. Pass it through \safewhatsit, to take care of + % the preceding space. + \safewhatsit\domark + % + % Insert space above the heading. + \csname #2headingbreak\endcsname + % + % Now the second mark, after the heading break. No break points + % between here and the heading. + \let\prevsectiondefs=\lastsectiondefs + \domark + % + % Only insert the space after the number if we have a section number. + \ifx\temptype\Ynothingkeyword + \setbox0 = \hbox{}% + \def\toctype{unn}% + \gdef\lastsection{#1}% + \else\ifx\temptype\Yomitfromtockeyword + % for @headings -- no section number, don't include in toc, + % and don't redefine \lastsection. + \setbox0 = \hbox{}% + \def\toctype{omit}% + \let\sectionlevel=\empty + \else\ifx\temptype\Yappendixkeyword + \setbox0 = \hbox{#4\enspace}% + \def\toctype{app}% + \gdef\lastsection{#1}% + \else + \setbox0 = \hbox{#4\enspace}% + \def\toctype{num}% + \gdef\lastsection{#1}% + \fi\fi\fi + % + % Write the toc entry (before \donoderef). See comments in \chapmacro. + \writetocentry{\toctype\sectionlevel}{#1}{#4}% + % + % Write the node reference (= pdf destination for pdftex). + % Again, see comments in \chapmacro. + \donoderef{#3}% + % + % Interline glue will be inserted when the vbox is completed. + % That glue will be a valid breakpoint for the page, since it'll be + % preceded by a whatsit (usually from the \donoderef, or from the + % \writetocentry if there was no node). We don't want to allow that + % break, since then the whatsits could end up on page n while the + % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. + \nobreak + % + % Output the actual section heading. + \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright + \hangindent=\wd0 % zero if no section number + \unhbox0 #1}% + }% + % Add extra space after the heading -- half of whatever came above it. + % Don't allow stretch, though. + \kern .5 \csname #2headingskip\endcsname + % + % Do not let the kern be a potential breakpoint, as it would be if it + % was followed by glue. + \nobreak + % + % We'll almost certainly start a paragraph next, so don't let that + % glue accumulate. (Not a breakpoint because it's preceded by a + % discardable item.) However, when a paragraph is not started next + % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out + % or the negative glue will cause weirdly wrong output, typically + % obscuring the section heading with something else. + \vskip-\parskip + % + % This is so the last item on the main vertical list is a known + % \penalty > 10000, so \startdefun, etc., can recognize the situation + % and do the needful. + \penalty 10001 +} + + +\message{toc,} +% Table of contents. +\newwrite\tocfile + +% Write an entry to the toc file, opening it if necessary. +% Called from @chapter, etc. +% +% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} +% We append the current node name (if any) and page number as additional +% arguments for the \{chap,sec,...}entry macros which will eventually +% read this. The node name is used in the pdf outlines as the +% destination to jump to. +% +% We open the .toc file for writing here instead of at @setfilename (or +% any other fixed time) so that @contents can be anywhere in the document. +% But if #1 is `omit', then we don't do anything. This is used for the +% table of contents chapter openings themselves. +% +\newif\iftocfileopened +\def\omitkeyword{omit}% +% +\def\writetocentry#1#2#3{% + \edef\writetoctype{#1}% + \ifx\writetoctype\omitkeyword \else + \iftocfileopened\else + \immediate\openout\tocfile = \jobname.toc + \global\tocfileopenedtrue + \fi + % + \iflinks + {\atdummies + \edef\temp{% + \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% + \temp + }% + \fi + \fi + % + % Tell \shipout to create a pdf destination on each page, if we're + % writing pdf. These are used in the table of contents. We can't + % just write one on every page because the title pages are numbered + % 1 and 2 (the page numbers aren't printed), and so are the first + % two pages of the document. Thus, we'd have two destinations named + % `1', and two named `2'. + \ifpdf \global\pdfmakepagedesttrue \fi +} + + +% These characters do not print properly in the Computer Modern roman +% fonts, so we must take special care. This is more or less redundant +% with the Texinfo input format setup at the end of this file. +% +\def\activecatcodes{% + \catcode`\"=\active + \catcode`\$=\active + \catcode`\<=\active + \catcode`\>=\active + \catcode`\\=\active + \catcode`\^=\active + \catcode`\_=\active + \catcode`\|=\active + \catcode`\~=\active +} + + +% Read the toc file, which is essentially Texinfo input. +\def\readtocfile{% + \setupdatafile + \activecatcodes + \input \tocreadfilename +} + +\newskip\contentsrightmargin \contentsrightmargin=1in +\newcount\savepageno +\newcount\lastnegativepageno \lastnegativepageno = -1 + +% Prepare to read what we've written to \tocfile. +% +\def\startcontents#1{% + % If @setchapternewpage on, and @headings double, the contents should + % start on an odd page, unlike chapters. Thus, we maintain + % \contentsalignmacro in parallel with \pagealignmacro. + % From: Torbjorn Granlund <tege@matematik.su.se> + \contentsalignmacro + \immediate\closeout\tocfile + % + % Don't need to put `Contents' or `Short Contents' in the headline. + % It is abundantly clear what they are. + \chapmacro{#1}{Yomitfromtoc}{}% + % + \savepageno = \pageno + \begingroup % Set up to handle contents files properly. + \raggedbottom % Worry more about breakpoints than the bottom. + \advance\hsize by -\contentsrightmargin % Don't use the full line length. + % + % Roman numerals for page numbers. + \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi +} + +% redefined for the two-volume lispref. We always output on +% \jobname.toc even if this is redefined. +% +\def\tocreadfilename{\jobname.toc} + +% Normal (long) toc. +% +\def\contents{% + \startcontents{\putwordTOC}% + \openin 1 \tocreadfilename\space + \ifeof 1 \else + \readtocfile + \fi + \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \ifeof 1 \else + \pdfmakeoutlines + \fi + \closein 1 + \endgroup + \lastnegativepageno = \pageno + \global\pageno = \savepageno +} + +% And just the chapters. +\def\summarycontents{% + \startcontents{\putwordShortTOC}% + % + \let\partentry = \shortpartentry + \let\numchapentry = \shortchapentry + \let\appentry = \shortchapentry + \let\unnchapentry = \shortunnchapentry + % We want a true roman here for the page numbers. + \secfonts + \let\rm=\shortcontrm \let\bf=\shortcontbf + \let\sl=\shortcontsl \let\tt=\shortconttt + \rm + \hyphenpenalty = 10000 + \advance\baselineskip by 1pt % Open it up a little. + \def\numsecentry##1##2##3##4{} + \let\appsecentry = \numsecentry + \let\unnsecentry = \numsecentry + \let\numsubsecentry = \numsecentry + \let\appsubsecentry = \numsecentry + \let\unnsubsecentry = \numsecentry + \let\numsubsubsecentry = \numsecentry + \let\appsubsubsecentry = \numsecentry + \let\unnsubsubsecentry = \numsecentry + \openin 1 \tocreadfilename\space + \ifeof 1 \else + \readtocfile + \fi + \closein 1 + \vfill \eject + \contentsalignmacro % in case @setchapternewpage odd is in effect + \endgroup + \lastnegativepageno = \pageno + \global\pageno = \savepageno +} +\let\shortcontents = \summarycontents + +% Typeset the label for a chapter or appendix for the short contents. +% The arg is, e.g., `A' for an appendix, or `3' for a chapter. +% +\def\shortchaplabel#1{% + % This space should be enough, since a single number is .5em, and the + % widest letter (M) is 1em, at least in the Computer Modern fonts. + % But use \hss just in case. + % (This space doesn't include the extra space that gets added after + % the label; that gets put in by \shortchapentry above.) + % + % We'd like to right-justify chapter numbers, but that looks strange + % with appendix letters. And right-justifying numbers and + % left-justifying letters looks strange when there is less than 10 + % chapters. Have to read the whole toc once to know how many chapters + % there are before deciding ... + \hbox to 1em{#1\hss}% +} + +% These macros generate individual entries in the table of contents. +% The first argument is the chapter or section name. +% The last argument is the page number. +% The arguments in between are the chapter number, section number, ... + +% Parts, in the main contents. Replace the part number, which doesn't +% exist, with an empty box. Let's hope all the numbers have the same width. +% Also ignore the page number, which is conventionally not printed. +\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} +\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} +% +% Parts, in the short toc. +\def\shortpartentry#1#2#3#4{% + \penalty-300 + \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip + \shortchapentry{{\bf #1}}{\numeralbox}{}{}% +} + +% Chapters, in the main contents. +\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} +% +% Chapters, in the short toc. +% See comments in \dochapentry re vbox and related settings. +\def\shortchapentry#1#2#3#4{% + \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% +} + +% Appendices, in the main contents. +% Need the word Appendix, and a fixed-size box. +% +\def\appendixbox#1{% + % We use M since it's probably the widest letter. + \setbox0 = \hbox{\putwordAppendix{} M}% + \hbox to \wd0{\putwordAppendix{} #1\hss}} +% +\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}} + +% Unnumbered chapters. +\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} +\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} + +% Sections. +\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} +\let\appsecentry=\numsecentry +\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} + +% Subsections. +\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} +\let\appsubsecentry=\numsubsecentry +\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} + +% And subsubsections. +\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} +\let\appsubsubsecentry=\numsubsubsecentry +\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} + +% This parameter controls the indentation of the various levels. +% Same as \defaultparindent. +\newdimen\tocindent \tocindent = 15pt + +% Now for the actual typesetting. In all these, #1 is the text and #2 is the +% page number. +% +% If the toc has to be broken over pages, we want it to be at chapters +% if at all possible; hence the \penalty. +\def\dochapentry#1#2{% + \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip + \begingroup + \chapentryfonts + \tocentry{#1}{\dopageno\bgroup#2\egroup}% + \endgroup + \nobreak\vskip .25\baselineskip plus.1\baselineskip +} + +\def\dosecentry#1#2{\begingroup + \secentryfonts \leftskip=\tocindent + \tocentry{#1}{\dopageno\bgroup#2\egroup}% +\endgroup} + +\def\dosubsecentry#1#2{\begingroup + \subsecentryfonts \leftskip=2\tocindent + \tocentry{#1}{\dopageno\bgroup#2\egroup}% +\endgroup} + +\def\dosubsubsecentry#1#2{\begingroup + \subsubsecentryfonts \leftskip=3\tocindent + \tocentry{#1}{\dopageno\bgroup#2\egroup}% +\endgroup} + +% We use the same \entry macro as for the index entries. +\let\tocentry = \entry + +% Space between chapter (or whatever) number and the title. +\def\labelspace{\hskip1em \relax} + +\def\dopageno#1{{\rm #1}} +\def\doshortpageno#1{{\rm #1}} + +\def\chapentryfonts{\secfonts \rm} +\def\secentryfonts{\textfonts} +\def\subsecentryfonts{\textfonts} +\def\subsubsecentryfonts{\textfonts} + + +\message{environments,} +% @foo ... @end foo. + +% @tex ... @end tex escapes into raw TeX temporarily. +% One exception: @ is still an escape character, so that @end tex works. +% But \@ or @@ will get a plain @ character. + +\envdef\tex{% + \setupmarkupstyle{tex}% + \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 + \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 + \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie + \catcode `\%=14 + \catcode `\+=\other + \catcode `\"=\other + \catcode `\|=\other + \catcode `\<=\other + \catcode `\>=\other + \catcode`\`=\other + \catcode`\'=\other + \escapechar=`\\ + % + % ' is active in math mode (mathcode"8000). So reset it, and all our + % other math active characters (just in case), to plain's definitions. + \mathactive + % + \let\b=\ptexb + \let\bullet=\ptexbullet + \let\c=\ptexc + \let\,=\ptexcomma + \let\.=\ptexdot + \let\dots=\ptexdots + \let\equiv=\ptexequiv + \let\!=\ptexexclam + \let\i=\ptexi + \let\indent=\ptexindent + \let\noindent=\ptexnoindent + \let\{=\ptexlbrace + \let\+=\tabalign + \let\}=\ptexrbrace + \let\/=\ptexslash + \let\*=\ptexstar + \let\t=\ptext + \expandafter \let\csname top\endcsname=\ptextop % outer + \let\frenchspacing=\plainfrenchspacing + % + \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% + \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% + \def\@{@}% +} +% There is no need to define \Etex. + +% Define @lisp ... @end lisp. +% @lisp environment forms a group so it can rebind things, +% including the definition of @end lisp (which normally is erroneous). + +% Amount to narrow the margins by for @lisp. +\newskip\lispnarrowing \lispnarrowing=0.4in + +% This is the definition that ^^M gets inside @lisp, @example, and other +% such environments. \null is better than a space, since it doesn't +% have any width. +\def\lisppar{\null\endgraf} + +% This space is always present above and below environments. +\newskip\envskipamount \envskipamount = 0pt + +% Make spacing and below environment symmetrical. We use \parskip here +% to help in doing that, since in @example-like environments \parskip +% is reset to zero; thus the \afterenvbreak inserts no space -- but the +% start of the next paragraph will insert \parskip. +% +\def\aboveenvbreak{{% + % =10000 instead of <10000 because of a special case in \itemzzz and + % \sectionheading, q.v. + \ifnum \lastpenalty=10000 \else + \advance\envskipamount by \parskip + \endgraf + \ifdim\lastskip<\envskipamount + \removelastskip + % it's not a good place to break if the last penalty was \nobreak + % or better ... + \ifnum\lastpenalty<10000 \penalty-50 \fi + \vskip\envskipamount + \fi + \fi +}} + +\let\afterenvbreak = \aboveenvbreak + +% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will +% also clear it, so that its embedded environments do the narrowing again. +\let\nonarrowing=\relax + +% @cartouche ... @end cartouche: draw rectangle w/rounded corners around +% environment contents. +\font\circle=lcircle10 +\newdimen\circthick +\newdimen\cartouter\newdimen\cartinner +\newskip\normbskip\newskip\normpskip\newskip\normlskip +\circthick=\fontdimen8\circle +% +\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth +\def\ctr{{\hskip 6pt\circle\char'010}} +\def\cbl{{\circle\char'012\hskip -6pt}} +\def\cbr{{\hskip 6pt\circle\char'011}} +\def\carttop{\hbox to \cartouter{\hskip\lskip + \ctl\leaders\hrule height\circthick\hfil\ctr + \hskip\rskip}} +\def\cartbot{\hbox to \cartouter{\hskip\lskip + \cbl\leaders\hrule height\circthick\hfil\cbr + \hskip\rskip}} +% +\newskip\lskip\newskip\rskip + +\envdef\cartouche{% + \ifhmode\par\fi % can't be in the midst of a paragraph. + \startsavinginserts + \lskip=\leftskip \rskip=\rightskip + \leftskip=0pt\rightskip=0pt % we want these *outside*. + \cartinner=\hsize \advance\cartinner by-\lskip + \advance\cartinner by-\rskip + \cartouter=\hsize + \advance\cartouter by 18.4pt % allow for 3pt kerns on either + % side, and for 6pt waste from + % each corner char, and rule thickness + \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip + % Flag to tell @lisp, etc., not to narrow margin. + \let\nonarrowing = t% + % + % If this cartouche directly follows a sectioning command, we need the + % \parskip glue (backspaced over by default) or the cartouche can + % collide with the section heading. + \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi + % + \vbox\bgroup + \baselineskip=0pt\parskip=0pt\lineskip=0pt + \carttop + \hbox\bgroup + \hskip\lskip + \vrule\kern3pt + \vbox\bgroup + \kern3pt + \hsize=\cartinner + \baselineskip=\normbskip + \lineskip=\normlskip + \parskip=\normpskip + \vskip -\parskip + \comment % For explanation, see the end of def\group. +} +\def\Ecartouche{% + \ifhmode\par\fi + \kern3pt + \egroup + \kern3pt\vrule + \hskip\rskip + \egroup + \cartbot + \egroup + \checkinserts +} + + +% This macro is called at the beginning of all the @example variants, +% inside a group. +\newdimen\nonfillparindent +\def\nonfillstart{% + \aboveenvbreak + \hfuzz = 12pt % Don't be fussy + \sepspaces % Make spaces be word-separators rather than space tokens. + \let\par = \lisppar % don't ignore blank lines + \obeylines % each line of input is a line of output + \parskip = 0pt + % Turn off paragraph indentation but redefine \indent to emulate + % the normal \indent. + \nonfillparindent=\parindent + \parindent = 0pt + \let\indent\nonfillindent + % + \emergencystretch = 0pt % don't try to avoid overfull boxes + \ifx\nonarrowing\relax + \advance \leftskip by \lispnarrowing + \exdentamount=\lispnarrowing + \else + \let\nonarrowing = \relax + \fi + \let\exdent=\nofillexdent +} + +\begingroup +\obeyspaces +% We want to swallow spaces (but not other tokens) after the fake +% @indent in our nonfill-environments, where spaces are normally +% active and set to @tie, resulting in them not being ignored after +% @indent. +\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% +\gdef\nonfillindentcheck{% +\ifx\temp % +\expandafter\nonfillindentgobble% +\else% +\leavevmode\nonfillindentbox% +\fi% +}% +\endgroup +\def\nonfillindentgobble#1{\nonfillindent} +\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} + +% If you want all examples etc. small: @set dispenvsize small. +% If you want even small examples the full size: @set dispenvsize nosmall. +% This affects the following displayed environments: +% @example, @display, @format, @lisp +% +\def\smallword{small} +\def\nosmallword{nosmall} +\let\SETdispenvsize\relax +\def\setnormaldispenv{% + \ifx\SETdispenvsize\smallword + % end paragraph for sake of leading, in case document has no blank + % line. This is redundant with what happens in \aboveenvbreak, but + % we need to do it before changing the fonts, and it's inconvenient + % to change the fonts afterward. + \ifnum \lastpenalty=10000 \else \endgraf \fi + \smallexamplefonts \rm + \fi +} +\def\setsmalldispenv{% + \ifx\SETdispenvsize\nosmallword + \else + \ifnum \lastpenalty=10000 \else \endgraf \fi + \smallexamplefonts \rm + \fi +} + +% We often define two environments, @foo and @smallfoo. +% Let's do it in one command. #1 is the env name, #2 the definition. +\def\makedispenvdef#1#2{% + \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}% + \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}% + \expandafter\let\csname E#1\endcsname \afterenvbreak + \expandafter\let\csname Esmall#1\endcsname \afterenvbreak +} + +% Define two environment synonyms (#1 and #2) for an environment. +\def\maketwodispenvdef#1#2#3{% + \makedispenvdef{#1}{#3}% + \makedispenvdef{#2}{#3}% +} +% +% @lisp: indented, narrowed, typewriter font; +% @example: same as @lisp. +% +% @smallexample and @smalllisp: use smaller fonts. +% Originally contributed by Pavel@xerox. +% +\maketwodispenvdef{lisp}{example}{% + \nonfillstart + \tt\setupmarkupstyle{example}% + \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. + \gobble % eat return +} +% @display/@smalldisplay: same as @lisp except keep current font. +% +\makedispenvdef{display}{% + \nonfillstart + \gobble +} + +% @format/@smallformat: same as @display except don't narrow margins. +% +\makedispenvdef{format}{% + \let\nonarrowing = t% + \nonfillstart + \gobble +} + +% @flushleft: same as @format, but doesn't obey \SETdispenvsize. +\envdef\flushleft{% + \let\nonarrowing = t% + \nonfillstart + \gobble +} +\let\Eflushleft = \afterenvbreak + +% @flushright. +% +\envdef\flushright{% + \let\nonarrowing = t% + \nonfillstart + \advance\leftskip by 0pt plus 1fill\relax + \gobble +} +\let\Eflushright = \afterenvbreak + + +% @raggedright does more-or-less normal line breaking but no right +% justification. From plain.tex. +\envdef\raggedright{% + \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax +} +\let\Eraggedright\par + +\envdef\raggedleft{% + \parindent=0pt \leftskip0pt plus2em + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt + \hbadness=10000 % Last line will usually be underfull, so turn off + % badness reporting. +} +\let\Eraggedleft\par + +\envdef\raggedcenter{% + \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em + \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt + \hbadness=10000 % Last line will usually be underfull, so turn off + % badness reporting. +} +\let\Eraggedcenter\par + + +% @quotation does normal linebreaking (hence we can't use \nonfillstart) +% and narrows the margins. We keep \parskip nonzero in general, since +% we're doing normal filling. So, when using \aboveenvbreak and +% \afterenvbreak, temporarily make \parskip 0. +% +\makedispenvdef{quotation}{\quotationstart} +% +\def\quotationstart{% + \indentedblockstart % same as \indentedblock, but increase right margin too. + \ifx\nonarrowing\relax + \advance\rightskip by \lispnarrowing + \fi + \parsearg\quotationlabel +} + +% We have retained a nonzero parskip for the environment, since we're +% doing normal filling. +% +\def\Equotation{% + \par + \ifx\quotationauthor\thisisundefined\else + % indent a bit. + \leftline{\kern 2\leftskip \sl ---\quotationauthor}% + \fi + {\parskip=0pt \afterenvbreak}% +} +\def\Esmallquotation{\Equotation} + +% If we're given an argument, typeset it in bold with a colon after. +\def\quotationlabel#1{% + \def\temp{#1}% + \ifx\temp\empty \else + {\bf #1: }% + \fi +} + +% @indentedblock is like @quotation, but indents only on the left and +% has no optional argument. +% +\makedispenvdef{indentedblock}{\indentedblockstart} +% +\def\indentedblockstart{% + {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip + \parindent=0pt + % + % @cartouche defines \nonarrowing to inhibit narrowing at next level down. + \ifx\nonarrowing\relax + \advance\leftskip by \lispnarrowing + \exdentamount = \lispnarrowing + \else + \let\nonarrowing = \relax + \fi +} + +% Keep a nonzero parskip for the environment, since we're doing normal filling. +% +\def\Eindentedblock{% + \par + {\parskip=0pt \afterenvbreak}% +} +\def\Esmallindentedblock{\Eindentedblock} + + +% LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>} +% If we want to allow any <char> as delimiter, +% we need the curly braces so that makeinfo sees the @verb command, eg: +% `@verbx...x' would look like the '@verbx' command. --janneke@gnu.org +% +% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook. +% +% [Knuth] p.344; only we need to do the other characters Texinfo sets +% active too. Otherwise, they get lost as the first character on a +% verbatim line. +\def\dospecials{% + \do\ \do\\\do\{\do\}\do\$\do\&% + \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% + \do\<\do\>\do\|\do\@\do+\do\"% + % Don't do the quotes -- if we do, @set txicodequoteundirected and + % @set txicodequotebacktick will not have effect on @verb and + % @verbatim, and ?` and !` ligatures won't get disabled. + %\do\`\do\'% +} +% +% [Knuth] p. 380 +\def\uncatcodespecials{% + \def\do##1{\catcode`##1=\other}\dospecials} +% +% Setup for the @verb command. +% +% Eight spaces for a tab +\begingroup + \catcode`\^^I=\active + \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }} +\endgroup +% +\def\setupverb{% + \tt % easiest (and conventionally used) font for verbatim + \def\par{\leavevmode\endgraf}% + \setupmarkupstyle{verb}% + \tabeightspaces + % Respect line breaks, + % print special symbols as themselves, and + % make each space count + % must do in this order: + \obeylines \uncatcodespecials \sepspaces +} + +% Setup for the @verbatim environment +% +% Real tab expansion. +\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount +% +% We typeset each line of the verbatim in an \hbox, so we can handle +% tabs. The \global is in case the verbatim line starts with an accent, +% or some other command that starts with a begin-group. Otherwise, the +% entire \verbbox would disappear at the corresponding end-group, before +% it is typeset. Meanwhile, we can't have nested verbatim commands +% (can we?), so the \global won't be overwriting itself. +\newbox\verbbox +\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} +% +\begingroup + \catcode`\^^I=\active + \gdef\tabexpand{% + \catcode`\^^I=\active + \def^^I{\leavevmode\egroup + \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab + \divide\dimen\verbbox by\tabw + \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw + \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw + \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox + }% + } +\endgroup + +% start the verbatim environment. +\def\setupverbatim{% + \let\nonarrowing = t% + \nonfillstart + \tt % easiest (and conventionally used) font for verbatim + % The \leavevmode here is for blank lines. Otherwise, we would + % never \starttabox and the \egroup would end verbatim mode. + \def\par{\leavevmode\egroup\box\verbbox\endgraf}% + \tabexpand + \setupmarkupstyle{verbatim}% + % Respect line breaks, + % print special symbols as themselves, and + % make each space count. + % Must do in this order: + \obeylines \uncatcodespecials \sepspaces + \everypar{\starttabbox}% +} + +% Do the @verb magic: verbatim text is quoted by unique +% delimiter characters. Before first delimiter expect a +% right brace, after last delimiter expect closing brace: +% +% \def\doverb'{'<char>#1<char>'}'{#1} +% +% [Knuth] p. 382; only eat outer {} +\begingroup + \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other + \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next] +\endgroup +% +\def\verb{\begingroup\setupverb\doverb} +% +% +% Do the @verbatim magic: define the macro \doverbatim so that +% the (first) argument ends when '@end verbatim' is reached, ie: +% +% \def\doverbatim#1@end verbatim{#1} +% +% For Texinfo it's a lot easier than for LaTeX, +% because texinfo's \verbatim doesn't stop at '\end{verbatim}': +% we need not redefine '\', '{' and '}'. +% +% Inspired by LaTeX's verbatim command set [latex.ltx] +% +\begingroup + \catcode`\ =\active + \obeylines % + % ignore everything up to the first ^^M, that's the newline at the end + % of the @verbatim input line itself. Otherwise we get an extra blank + % line in the output. + \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% + % We really want {...\end verbatim} in the body of the macro, but + % without the active space; thus we have to use \xdef and \gobble. +\endgroup +% +\envdef\verbatim{% + \setupverbatim\doverbatim +} +\let\Everbatim = \afterenvbreak + + +% @verbatiminclude FILE - insert text of file in verbatim environment. +% +\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude} +% +\def\doverbatiminclude#1{% + {% + \makevalueexpandable + \setupverbatim + \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% + \input #1 + \afterenvbreak + }% +} + +% @copying ... @end copying. +% Save the text away for @insertcopying later. +% +% We save the uninterpreted tokens, rather than creating a box. +% Saving the text in a box would be much easier, but then all the +% typesetting commands (@smallbook, font changes, etc.) have to be done +% beforehand -- and a) we want @copying to be done first in the source +% file; b) letting users define the frontmatter in as flexible order as +% possible is very desirable. +% +\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} +\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} +% +\def\insertcopying{% + \begingroup + \parindent = 0pt % paragraph indentation looks wrong on title page + \scanexp\copyingtext + \endgroup +} + + +\message{defuns,} +% @defun etc. + +\newskip\defbodyindent \defbodyindent=.4in +\newskip\defargsindent \defargsindent=50pt +\newskip\deflastargmargin \deflastargmargin=18pt +\newcount\defunpenalty + +% Start the processing of @deffn: +\def\startdefun{% + \ifnum\lastpenalty<10000 + \medbreak + \defunpenalty=10003 % Will keep this @deffn together with the + % following @def command, see below. + \else + % If there are two @def commands in a row, we'll have a \nobreak, + % which is there to keep the function description together with its + % header. But if there's nothing but headers, we need to allow a + % break somewhere. Check specifically for penalty 10002, inserted + % by \printdefunline, instead of 10000, since the sectioning + % commands also insert a nobreak penalty, and we don't want to allow + % a break between a section heading and a defun. + % + % As a further refinement, we avoid "club" headers by signalling + % with penalty of 10003 after the very first @deffn in the + % sequence (see above), and penalty of 10002 after any following + % @def command. + \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi + % + % Similarly, after a section heading, do not allow a break. + % But do insert the glue. + \medskip % preceded by discardable penalty, so not a breakpoint + \fi + % + \parindent=0in + \advance\leftskip by \defbodyindent + \exdentamount=\defbodyindent +} + +\def\dodefunx#1{% + % First, check whether we are in the right environment: + \checkenv#1% + % + % As above, allow line break if we have multiple x headers in a row. + % It's not a great place, though. + \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi + % + % And now, it's time to reuse the body of the original defun: + \expandafter\gobbledefun#1% +} +\def\gobbledefun#1\startdefun{} + +% \printdefunline \deffnheader{text} +% +\def\printdefunline#1#2{% + \begingroup + % call \deffnheader: + #1#2 \endheader + % common ending: + \interlinepenalty = 10000 + \advance\rightskip by 0pt plus 1fil\relax + \endgraf + \nobreak\vskip -\parskip + \penalty\defunpenalty % signal to \startdefun and \dodefunx + % Some of the @defun-type tags do not enable magic parentheses, + % rendering the following check redundant. But we don't optimize. + \checkparencounts + \endgroup +} + +\def\Edefun{\endgraf\medbreak} + +% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; +% the only thing remaining is to define \deffnheader. +% +\def\makedefun#1{% + \expandafter\let\csname E#1\endcsname = \Edefun + \edef\temp{\noexpand\domakedefun + \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% + \temp +} + +% \domakedefun \deffn \deffnx \deffnheader +% +% Define \deffn and \deffnx, without parameters. +% \deffnheader has to be defined explicitly. +% +\def\domakedefun#1#2#3{% + \envdef#1{% + \startdefun + \doingtypefnfalse % distinguish typed functions from all else + \parseargusing\activeparens{\printdefunline#3}% + }% + \def#2{\dodefunx#1}% + \def#3% +} + +\newif\ifdoingtypefn % doing typed function? +\newif\ifrettypeownline % typeset return type on its own line? + +% @deftypefnnewline on|off says whether the return type of typed functions +% are printed on their own line. This affects @deftypefn, @deftypefun, +% @deftypeop, and @deftypemethod. +% +\parseargdef\deftypefnnewline{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETtxideftypefnnl\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETtxideftypefnnl\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @txideftypefnnl value `\temp', + must be on|off}% + \fi\fi +} + +% Untyped functions: + +% @deffn category name args +\makedefun{deffn}{\deffngeneral{}} + +% @deffn category class name args +\makedefun{defop}#1 {\defopon{#1\ \putwordon}} + +% \defopon {category on}class name args +\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } + +% \deffngeneral {subind}category name args +% +\def\deffngeneral#1#2 #3 #4\endheader{% + % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. + \dosubind{fn}{\code{#3}}{#1}% + \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% +} + +% Typed functions: + +% @deftypefn category type name args +\makedefun{deftypefn}{\deftypefngeneral{}} + +% @deftypeop category class type name args +\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} + +% \deftypeopon {category on}class type name args +\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } + +% \deftypefngeneral {subind}category type name args +% +\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% + \dosubind{fn}{\code{#4}}{#1}% + \doingtypefntrue + \defname{#2}{#3}{#4}\defunargs{#5\unskip}% +} + +% Typed variables: + +% @deftypevr category type var args +\makedefun{deftypevr}{\deftypecvgeneral{}} + +% @deftypecv category class type var args +\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} + +% \deftypecvof {category of}class type var args +\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } + +% \deftypecvgeneral {subind}category type var args +% +\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% + \dosubind{vr}{\code{#4}}{#1}% + \defname{#2}{#3}{#4}\defunargs{#5\unskip}% +} + +% Untyped variables: + +% @defvr category var args +\makedefun{defvr}#1 {\deftypevrheader{#1} {} } + +% @defcv category class var args +\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} + +% \defcvof {category of}class var args +\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } + +% Types: + +% @deftp category name args +\makedefun{deftp}#1 #2 #3\endheader{% + \doind{tp}{\code{#2}}% + \defname{#1}{}{#2}\defunargs{#3\unskip}% +} + +% Remaining @defun-like shortcuts: +\makedefun{defun}{\deffnheader{\putwordDeffunc} } +\makedefun{defmac}{\deffnheader{\putwordDefmac} } +\makedefun{defspec}{\deffnheader{\putwordDefspec} } +\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} } +\makedefun{defvar}{\defvrheader{\putwordDefvar} } +\makedefun{defopt}{\defvrheader{\putwordDefopt} } +\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } +\makedefun{defmethod}{\defopon\putwordMethodon} +\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} +\makedefun{defivar}{\defcvof\putwordInstanceVariableof} +\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} + +% \defname, which formats the name of the @def (not the args). +% #1 is the category, such as "Function". +% #2 is the return type, if any. +% #3 is the function name. +% +% We are followed by (but not passed) the arguments, if any. +% +\def\defname#1#2#3{% + \par + % Get the values of \leftskip and \rightskip as they were outside the @def... + \advance\leftskip by -\defbodyindent + % + % Determine if we are typesetting the return type of a typed function + % on a line by itself. + \rettypeownlinefalse + \ifdoingtypefn % doing a typed function specifically? + % then check user option for putting return type on its own line: + \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else + \rettypeownlinetrue + \fi + \fi + % + % How we'll format the category name. Putting it in brackets helps + % distinguish it from the body text that may end up on the next line + % just below it. + \def\temp{#1}% + \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} + % + % Figure out line sizes for the paragraph shape. We'll always have at + % least two. + \tempnum = 2 + % + % The first line needs space for \box0; but if \rightskip is nonzero, + % we need only space for the part of \box0 which exceeds it: + \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip + % + % If doing a return type on its own line, we'll have another line. + \ifrettypeownline + \advance\tempnum by 1 + \def\maybeshapeline{0in \hsize}% + \else + \def\maybeshapeline{}% + \fi + % + % The continuations: + \dimen2=\hsize \advance\dimen2 by -\defargsindent + % + % The final paragraph shape: + \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2 + % + % Put the category name at the right margin. + \noindent + \hbox to 0pt{% + \hfil\box0 \kern-\hsize + % \hsize has to be shortened this way: + \kern\leftskip + % Intentionally do not respect \rightskip, since we need the space. + }% + % + % Allow all lines to be underfull without complaint: + \tolerance=10000 \hbadness=10000 + \exdentamount=\defbodyindent + {% + % defun fonts. We use typewriter by default (used to be bold) because: + % . we're printing identifiers, they should be in tt in principle. + % . in languages with many accents, such as Czech or French, it's + % common to leave accents off identifiers. The result looks ok in + % tt, but exceedingly strange in rm. + % . we don't want -- and --- to be treated as ligatures. + % . this still does not fix the ?` and !` ligatures, but so far no + % one has made identifiers using them :). + \df \tt + \def\temp{#2}% text of the return type + \ifx\temp\empty\else + \tclose{\temp}% typeset the return type + \ifrettypeownline + % put return type on its own line; prohibit line break following: + \hfil\vadjust{\nobreak}\break + \else + \space % type on same line, so just followed by a space + \fi + \fi % no return type + #3% output function name + }% + {\rm\enskip}% hskip 0.5 em of \tenrm + % + \boldbrax + % arguments will be output next, if any. +} + +% Print arguments in slanted roman (not ttsl), inconsistently with using +% tt for the name. This is because literal text is sometimes needed in +% the argument list (groff manual), and ttsl and tt are not very +% distinguishable. Prevent hyphenation at `-' chars. +% +\def\defunargs#1{% + % use sl by default (not ttsl), + % tt for the names. + \df \sl \hyphenchar\font=0 + % + % On the other hand, if an argument has two dashes (for instance), we + % want a way to get ttsl. We used to recommend @var for that, so + % leave the code in, but it's strange for @var to lead to typewriter. + % Nowadays we recommend @code, since the difference between a ttsl hyphen + % and a tt hyphen is pretty tiny. @code also disables ?` !`. + \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% + #1% + \sl\hyphenchar\font=45 +} + +% We want ()&[] to print specially on the defun line. +% +\def\activeparens{% + \catcode`\(=\active \catcode`\)=\active + \catcode`\[=\active \catcode`\]=\active + \catcode`\&=\active +} + +% Make control sequences which act like normal parenthesis chars. +\let\lparen = ( \let\rparen = ) + +% Be sure that we always have a definition for `(', etc. For example, +% if the fn name has parens in it, \boldbrax will not be in effect yet, +% so TeX would otherwise complain about undefined control sequence. +{ + \activeparens + \global\let(=\lparen \global\let)=\rparen + \global\let[=\lbrack \global\let]=\rbrack + \global\let& = \& + + \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} + \gdef\magicamp{\let&=\amprm} +} + +\newcount\parencount + +% If we encounter &foo, then turn on ()-hacking afterwards +\newif\ifampseen +\def\amprm#1 {\ampseentrue{\bf\ }} + +\def\parenfont{% + \ifampseen + % At the first level, print parens in roman, + % otherwise use the default font. + \ifnum \parencount=1 \rm \fi + \else + % The \sf parens (in \boldbrax) actually are a little bolder than + % the contained text. This is especially needed for [ and ] . + \sf + \fi +} +\def\infirstlevel#1{% + \ifampseen + \ifnum\parencount=1 + #1% + \fi + \fi +} +\def\bfafterword#1 {#1 \bf} + +\def\opnr{% + \global\advance\parencount by 1 + {\parenfont(}% + \infirstlevel \bfafterword +} +\def\clnr{% + {\parenfont)}% + \infirstlevel \sl + \global\advance\parencount by -1 +} + +\newcount\brackcount +\def\lbrb{% + \global\advance\brackcount by 1 + {\bf[}% +} +\def\rbrb{% + {\bf]}% + \global\advance\brackcount by -1 +} + +\def\checkparencounts{% + \ifnum\parencount=0 \else \badparencount \fi + \ifnum\brackcount=0 \else \badbrackcount \fi +} +% these should not use \errmessage; the glibc manual, at least, actually +% has such constructs (when documenting function pointers). +\def\badparencount{% + \message{Warning: unbalanced parentheses in @def...}% + \global\parencount=0 +} +\def\badbrackcount{% + \message{Warning: unbalanced square brackets in @def...}% + \global\brackcount=0 +} + + +\message{macros,} +% @macro. + +% To do this right we need a feature of e-TeX, \scantokens, +% which we arrange to emulate with a temporary file in ordinary TeX. +\ifx\eTeXversion\thisisundefined + \newwrite\macscribble + \def\scantokens#1{% + \toks0={#1}% + \immediate\openout\macscribble=\jobname.tmp + \immediate\write\macscribble{\the\toks0}% + \immediate\closeout\macscribble + \input \jobname.tmp + } +\fi + +\def\scanmacro#1{\begingroup + \newlinechar`\^^M + \let\xeatspaces\eatspaces + % + % Undo catcode changes of \startcontents and \doprintindex + % When called from @insertcopying or (short)caption, we need active + % backslash to get it printed correctly. Previously, we had + % \catcode`\\=\other instead. We'll see whether a problem appears + % with macro expansion. --kasal, 19aug04 + \catcode`\@=0 \catcode`\\=\active \escapechar=`\@ + % + % ... and for \example: + \spaceisspace + % + % The \empty here causes a following catcode 5 newline to be eaten as + % part of reading whitespace after a control sequence. It does not + % eat a catcode 13 newline. There's no good way to handle the two + % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX + % would then have different behavior). See the Macro Details node in + % the manual for the workaround we recommend for macros and + % line-oriented commands. + % + \scantokens{#1\empty}% +\endgroup} + +\def\scanexp#1{% + \edef\temp{\noexpand\scanmacro{#1}}% + \temp +} + +\newcount\paramno % Count of parameters +\newtoks\macname % Macro name +\newif\ifrecursive % Is it recursive? + +% List of all defined macros in the form +% \definedummyword\macro1\definedummyword\macro2... +% Currently is also contains all @aliases; the list can be split +% if there is a need. +\def\macrolist{} + +% Add the macro to \macrolist +\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} +\def\addtomacrolistxxx#1{% + \toks0 = \expandafter{\macrolist\definedummyword#1}% + \xdef\macrolist{\the\toks0}% +} + +% Utility routines. +% This does \let #1 = #2, with \csnames; that is, +% \let \csname#1\endcsname = \csname#2\endcsname +% (except of course we have to play expansion games). +% +\def\cslet#1#2{% + \expandafter\let + \csname#1\expandafter\endcsname + \csname#2\endcsname +} + +% Trim leading and trailing spaces off a string. +% Concepts from aro-bend problem 15 (see CTAN). +{\catcode`\@=11 +\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }} +\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@} +\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @} +\def\unbrace#1{#1} +\unbrace{\gdef\trim@@@ #1 } #2@{#1} +} + +% Trim a single trailing ^^M off a string. +{\catcode`\^^M=\other \catcode`\Q=3% +\gdef\eatcr #1{\eatcra #1Q^^MQ}% +\gdef\eatcra#1^^MQ{\eatcrb#1Q}% +\gdef\eatcrb#1Q#2Q{#1}% +} + +% Macro bodies are absorbed as an argument in a context where +% all characters are catcode 10, 11 or 12, except \ which is active +% (as in normal texinfo). It is necessary to change the definition of \ +% to recognize macro arguments; this is the job of \mbodybackslash. +% +% Non-ASCII encodings make 8-bit characters active, so un-activate +% them to avoid their expansion. Must do this non-globally, to +% confine the change to the current group. +% +% It's necessary to have hard CRs when the macro is executed. This is +% done by making ^^M (\endlinechar) catcode 12 when reading the macro +% body, and then making it the \newlinechar in \scanmacro. +% +\def\scanctxt{% used as subroutine + \catcode`\"=\other + \catcode`\+=\other + \catcode`\<=\other + \catcode`\>=\other + \catcode`\@=\other + \catcode`\^=\other + \catcode`\_=\other + \catcode`\|=\other + \catcode`\~=\other + \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi +} + +\def\scanargctxt{% used for copying and captions, not macros. + \scanctxt + \catcode`\\=\other + \catcode`\^^M=\other +} + +\def\macrobodyctxt{% used for @macro definitions + \scanctxt + \catcode`\{=\other + \catcode`\}=\other + \catcode`\^^M=\other + \usembodybackslash +} + +\def\macroargctxt{% used when scanning invocations + \scanctxt + \catcode`\\=0 +} +% why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes" +% for the single characters \ { }. Thus, we end up with the "commands" +% that would be written @\ @{ @} in a Texinfo document. +% +% We already have @{ and @}. For @\, we define it here, and only for +% this purpose, to produce a typewriter backslash (so, the @\ that we +% define for @math can't be used with @macro calls): +% +\def\\{\normalbackslash}% +% +% We would like to do this for \, too, since that is what makeinfo does. +% But it is not possible, because Texinfo already has a command @, for a +% cedilla accent. Documents must use @comma{} instead. +% +% \anythingelse will almost certainly be an error of some kind. + + +% \mbodybackslash is the definition of \ in @macro bodies. +% It maps \foo\ => \csname macarg.foo\endcsname => #N +% where N is the macro parameter number. +% We define \csname macarg.\endcsname to be \realbackslash, so +% \\ in macro replacement text gets you a backslash. +% +{\catcode`@=0 @catcode`@\=@active + @gdef@usembodybackslash{@let\=@mbodybackslash} + @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} +} +\expandafter\def\csname macarg.\endcsname{\realbackslash} + +\def\margbackslash#1{\char`\#1 } + +\def\macro{\recursivefalse\parsearg\macroxxx} +\def\rmacro{\recursivetrue\parsearg\macroxxx} + +\def\macroxxx#1{% + \getargs{#1}% now \macname is the macname and \argl the arglist + \ifx\argl\empty % no arguments + \paramno=0\relax + \else + \expandafter\parsemargdef \argl;% + \if\paramno>256\relax + \ifx\eTeXversion\thisisundefined + \errhelp = \EMsimple + \errmessage{You need eTeX to compile a file with macros with more than 256 arguments} + \fi + \fi + \fi + \if1\csname ismacro.\the\macname\endcsname + \message{Warning: redefining \the\macname}% + \else + \expandafter\ifx\csname \the\macname\endcsname \relax + \else \errmessage{Macro name \the\macname\space already defined}\fi + \global\cslet{macsave.\the\macname}{\the\macname}% + \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% + \addtomacrolist{\the\macname}% + \fi + \begingroup \macrobodyctxt + \ifrecursive \expandafter\parsermacbody + \else \expandafter\parsemacbody + \fi} + +\parseargdef\unmacro{% + \if1\csname ismacro.#1\endcsname + \global\cslet{#1}{macsave.#1}% + \global\expandafter\let \csname ismacro.#1\endcsname=0% + % Remove the macro name from \macrolist: + \begingroup + \expandafter\let\csname#1\endcsname \relax + \let\definedummyword\unmacrodo + \xdef\macrolist{\macrolist}% + \endgroup + \else + \errmessage{Macro #1 not defined}% + \fi +} + +% Called by \do from \dounmacro on each macro. The idea is to omit any +% macro definitions that have been changed to \relax. +% +\def\unmacrodo#1{% + \ifx #1\relax + % remove this + \else + \noexpand\definedummyword \noexpand#1% + \fi +} + +% This makes use of the obscure feature that if the last token of a +% <parameter list> is #, then the preceding argument is delimited by +% an opening brace, and that opening brace is not consumed. +\def\getargs#1{\getargsxxx#1{}} +\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} +\def\getmacname#1 #2\relax{\macname={#1}} +\def\getmacargs#1{\def\argl{#1}} + +% For macro processing make @ a letter so that we can make Texinfo private macro names. +\edef\texiatcatcode{\the\catcode`\@} +\catcode `@=11\relax + +% Parse the optional {params} list. Set up \paramno and \paramlist +% so \defmacro knows what to do. Define \macarg.BLAH for each BLAH +% in the params list to some hook where the argument si to be expanded. If +% there are less than 10 arguments that hook is to be replaced by ##N where N +% is the position in that list, that is to say the macro arguments are to be +% defined `a la TeX in the macro body. +% +% That gets used by \mbodybackslash (above). +% +% We need to get `macro parameter char #' into several definitions. +% The technique used is stolen from LaTeX: let \hash be something +% unexpandable, insert that wherever you need a #, and then redefine +% it to # just before using the token list produced. +% +% The same technique is used to protect \eatspaces till just before +% the macro is used. +% +% If there are 10 or more arguments, a different technique is used, where the +% hook remains in the body, and when macro is to be expanded the body is +% processed again to replace the arguments. +% +% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the +% argument N value and then \edef the body (nothing else will expand because of +% the catcode regime underwhich the body was input). +% +% If you compile with TeX (not eTeX), and you have macros with 10 or more +% arguments, you need that no macro has more than 256 arguments, otherwise an +% error is produced. +\def\parsemargdef#1;{% + \paramno=0\def\paramlist{}% + \let\hash\relax + \let\xeatspaces\relax + \parsemargdefxxx#1,;,% + % In case that there are 10 or more arguments we parse again the arguments + % list to set new definitions for the \macarg.BLAH macros corresponding to + % each BLAH argument. It was anyhow needed to parse already once this list + % in order to count the arguments, and as macros with at most 9 arguments + % are by far more frequent than macro with 10 or more arguments, defining + % twice the \macarg.BLAH macros does not cost too much processing power. + \ifnum\paramno<10\relax\else + \paramno0\relax + \parsemmanyargdef@@#1,;,% 10 or more arguments + \fi +} +\def\parsemargdefxxx#1,{% + \if#1;\let\next=\relax + \else \let\next=\parsemargdefxxx + \advance\paramno by 1 + \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname + {\xeatspaces{\hash\the\paramno}}% + \edef\paramlist{\paramlist\hash\the\paramno,}% + \fi\next} + +\def\parsemmanyargdef@@#1,{% + \if#1;\let\next=\relax + \else + \let\next=\parsemmanyargdef@@ + \edef\tempb{\eatspaces{#1}}% + \expandafter\def\expandafter\tempa + \expandafter{\csname macarg.\tempb\endcsname}% + % Note that we need some extra \noexpand\noexpand, this is because we + % don't want \the to be expanded in the \parsermacbody as it uses an + % \xdef . + \expandafter\edef\tempa + {\noexpand\noexpand\noexpand\the\toks\the\paramno}% + \advance\paramno by 1\relax + \fi\next} + +% These two commands read recursive and nonrecursive macro bodies. +% (They're different since rec and nonrec macros end differently.) +% + +\catcode `\@\texiatcatcode +\long\def\parsemacbody#1@end macro% +{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% +\long\def\parsermacbody#1@end rmacro% +{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% +\catcode `\@=11\relax + +\let\endargs@\relax +\let\nil@\relax +\def\nilm@{\nil@}% +\long\def\nillm@{\nil@}% + +% This macro is expanded during the Texinfo macro expansion, not during its +% definition. It gets all the arguments values and assigns them to macros +% macarg.ARGNAME +% +% #1 is the macro name +% #2 is the list of argument names +% #3 is the list of argument values +\def\getargvals@#1#2#3{% + \def\macargdeflist@{}% + \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion. + \def\paramlist{#2,\nil@}% + \def\macroname{#1}% + \begingroup + \macroargctxt + \def\argvaluelist{#3,\nil@}% + \def\@tempa{#3}% + \ifx\@tempa\empty + \setemptyargvalues@ + \else + \getargvals@@ + \fi +} + +% +\def\getargvals@@{% + \ifx\paramlist\nilm@ + % Some sanity check needed here that \argvaluelist is also empty. + \ifx\argvaluelist\nillm@ + \else + \errhelp = \EMsimple + \errmessage{Too many arguments in macro `\macroname'!}% + \fi + \let\next\macargexpandinbody@ + \else + \ifx\argvaluelist\nillm@ + % No more arguments values passed to macro. Set remaining named-arg + % macros to empty. + \let\next\setemptyargvalues@ + \else + % pop current arg name into \@tempb + \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}% + \expandafter\@tempa\expandafter{\paramlist}% + % pop current argument value into \@tempc + \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}% + \expandafter\@tempa\expandafter{\argvaluelist}% + % Here \@tempb is the current arg name and \@tempc is the current arg value. + % First place the new argument macro definition into \@tempd + \expandafter\macname\expandafter{\@tempc}% + \expandafter\let\csname macarg.\@tempb\endcsname\relax + \expandafter\def\expandafter\@tempe\expandafter{% + \csname macarg.\@tempb\endcsname}% + \edef\@tempd{\long\def\@tempe{\the\macname}}% + \push@\@tempd\macargdeflist@ + \let\next\getargvals@@ + \fi + \fi + \next +} + +\def\push@#1#2{% + \expandafter\expandafter\expandafter\def + \expandafter\expandafter\expandafter#2% + \expandafter\expandafter\expandafter{% + \expandafter#1#2}% +} + +% Replace arguments by their values in the macro body, and place the result +% in macro \@tempa +\def\macvalstoargs@{% + % To do this we use the property that token registers that are \the'ed + % within an \edef expand only once. So we are going to place all argument + % values into respective token registers. + % + % First we save the token context, and initialize argument numbering. + \begingroup + \paramno0\relax + % Then, for each argument number #N, we place the corresponding argument + % value into a new token list register \toks#N + \expandafter\putargsintokens@\saveparamlist@,;,% + % Then, we expand the body so that argument are replaced by their + % values. The trick for values not to be expanded themselves is that they + % are within tokens and that tokens expand only once in an \edef . + \edef\@tempc{\csname mac.\macroname .body\endcsname}% + % Now we restore the token stack pointer to free the token list registers + % which we have used, but we make sure that expanded body is saved after + % group. + \expandafter + \endgroup + \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% + } + +\def\macargexpandinbody@{% + %% Define the named-macro outside of this group and then close this group. + \expandafter + \endgroup + \macargdeflist@ + % First the replace in body the macro arguments by their values, the result + % is in \@tempa . + \macvalstoargs@ + % Then we point at the \norecurse or \gobble (for recursive) macro value + % with \@tempb . + \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname + % Depending on whether it is recursive or not, we need some tailing + % \egroup . + \ifx\@tempb\gobble + \let\@tempc\relax + \else + \let\@tempc\egroup + \fi + % And now we do the real job: + \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}% + \@tempd +} + +\def\putargsintokens@#1,{% + \if#1;\let\next\relax + \else + \let\next\putargsintokens@ + % First we allocate the new token list register, and give it a temporary + % alias \@tempb . + \toksdef\@tempb\the\paramno + % Then we place the argument value into that token list register. + \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname + \expandafter\@tempb\expandafter{\@tempa}% + \advance\paramno by 1\relax + \fi + \next +} + +% Save the token stack pointer into macro #1 +\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}} +% Restore the token stack pointer from number in macro #1 +\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax} +% newtoks that can be used non \outer . +\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi} + +% Tailing missing arguments are set to empty +\def\setemptyargvalues@{% + \ifx\paramlist\nilm@ + \let\next\macargexpandinbody@ + \else + \expandafter\setemptyargvaluesparser@\paramlist\endargs@ + \let\next\setemptyargvalues@ + \fi + \next +} + +\def\setemptyargvaluesparser@#1,#2\endargs@{% + \expandafter\def\expandafter\@tempa\expandafter{% + \expandafter\def\csname macarg.#1\endcsname{}}% + \push@\@tempa\macargdeflist@ + \def\paramlist{#2}% +} + +% #1 is the element target macro +% #2 is the list macro +% #3,#4\endargs@ is the list value +\def\pop@#1#2#3,#4\endargs@{% + \def#1{#3}% + \def#2{#4}% +} +\long\def\longpop@#1#2#3,#4\endargs@{% + \long\def#1{#3}% + \long\def#2{#4}% +} + +% This defines a Texinfo @macro. There are eight cases: recursive and +% nonrecursive macros of zero, one, up to nine, and many arguments. +% Much magic with \expandafter here. +% \xdef is used so that macro definitions will survive the file +% they're defined in; @include reads the file inside a group. +% +\def\defmacro{% + \let\hash=##% convert placeholders to macro parameter chars + \ifrecursive + \ifcase\paramno + % 0 + \expandafter\xdef\csname\the\macname\endcsname{% + \noexpand\scanmacro{\temp}}% + \or % 1 + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \noexpand\braceorline + \expandafter\noexpand\csname\the\macname xxx\endcsname}% + \expandafter\xdef\csname\the\macname xxx\endcsname##1{% + \egroup\noexpand\scanmacro{\temp}}% + \else + \ifnum\paramno<10\relax % at most 9 + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \noexpand\csname\the\macname xx\endcsname}% + \expandafter\xdef\csname\the\macname xx\endcsname##1{% + \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% + \expandafter\expandafter + \expandafter\xdef + \expandafter\expandafter + \csname\the\macname xxx\endcsname + \paramlist{\egroup\noexpand\scanmacro{\temp}}% + \else % 10 or more + \expandafter\xdef\csname\the\macname\endcsname{% + \noexpand\getargvals@{\the\macname}{\argl}% + }% + \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp + \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble + \fi + \fi + \else + \ifcase\paramno + % 0 + \expandafter\xdef\csname\the\macname\endcsname{% + \noexpand\norecurse{\the\macname}% + \noexpand\scanmacro{\temp}\egroup}% + \or % 1 + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \noexpand\braceorline + \expandafter\noexpand\csname\the\macname xxx\endcsname}% + \expandafter\xdef\csname\the\macname xxx\endcsname##1{% + \egroup + \noexpand\norecurse{\the\macname}% + \noexpand\scanmacro{\temp}\egroup}% + \else % at most 9 + \ifnum\paramno<10\relax + \expandafter\xdef\csname\the\macname\endcsname{% + \bgroup\noexpand\macroargctxt + \expandafter\noexpand\csname\the\macname xx\endcsname}% + \expandafter\xdef\csname\the\macname xx\endcsname##1{% + \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% + \expandafter\expandafter + \expandafter\xdef + \expandafter\expandafter + \csname\the\macname xxx\endcsname + \paramlist{% + \egroup + \noexpand\norecurse{\the\macname}% + \noexpand\scanmacro{\temp}\egroup}% + \else % 10 or more: + \expandafter\xdef\csname\the\macname\endcsname{% + \noexpand\getargvals@{\the\macname}{\argl}% + }% + \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp + \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse + \fi + \fi + \fi} + +\catcode `\@\texiatcatcode\relax + +\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} + +% \braceorline decides whether the next nonwhitespace character is a +% {. If so it reads up to the closing }, if not, it reads the whole +% line. Whatever was read is then fed to the next control sequence +% as an argument (by \parsebrace or \parsearg). +% +\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} +\def\braceorlinexxx{% + \ifx\nchar\bgroup\else + \expandafter\parsearg + \fi \macnamexxx} + + +% @alias. +% We need some trickery to remove the optional spaces around the equal +% sign. Make them active and then expand them all to nothing. +% +\def\alias{\parseargusing\obeyspaces\aliasxxx} +\def\aliasxxx #1{\aliasyyy#1\relax} +\def\aliasyyy #1=#2\relax{% + {% + \expandafter\let\obeyedspace=\empty + \addtomacrolist{#1}% + \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% + }% + \next +} + + +\message{cross references,} + +\newwrite\auxfile +\newif\ifhavexrefs % True if xref values are known. +\newif\ifwarnedxrefs % True if we warned once that they aren't known. + +% @inforef is relatively simple. +\def\inforef #1{\inforefzzz #1,,,,**} +\def\inforefzzz #1,#2,#3,#4**{% + \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, + node \samp{\ignorespaces#1{}}} + +% @node's only job in TeX is to define \lastnode, which is used in +% cross-references. The @node line might or might not have commas, and +% might or might not have spaces before the first comma, like: +% @node foo , bar , ... +% We don't want such trailing spaces in the node name. +% +\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} +% +% also remove a trailing comma, in case of something like this: +% @node Help-Cross, , , Cross-refs +\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} +\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} + +\let\nwnode=\node +\let\lastnode=\empty + +% Write a cross-reference definition for the current node. #1 is the +% type (Ynumbered, Yappendix, Ynothing). +% +\def\donoderef#1{% + \ifx\lastnode\empty\else + \setref{\lastnode}{#1}% + \global\let\lastnode=\empty + \fi +} + +% @anchor{NAME} -- define xref target at arbitrary point. +% +\newcount\savesfregister +% +\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} +\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} +\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} + +% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an +% anchor), which consists of three parts: +% 1) NAME-title - the current sectioning name taken from \lastsection, +% or the anchor name. +% 2) NAME-snt - section number and type, passed as the SNT arg, or +% empty for anchors. +% 3) NAME-pg - the page number. +% +% This is called from \donoderef, \anchor, and \dofloat. In the case of +% floats, there is an additional part, which is not written here: +% 4) NAME-lof - the text as it should appear in a @listoffloats. +% +\def\setref#1#2{% + \pdfmkdest{#1}% + \iflinks + {% + \atdummies % preserve commands, but don't expand them + \edef\writexrdef##1##2{% + \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef + ##1}{##2}}% these are parameters of \writexrdef + }% + \toks0 = \expandafter{\lastsection}% + \immediate \writexrdef{title}{\the\toks0 }% + \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. + \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout + }% + \fi +} + +% @xrefautosectiontitle on|off says whether @section(ing) names are used +% automatically in xrefs, if the third arg is not explicitly specified. +% This was provided as a "secret" @set xref-automatic-section-title +% variable, now it's official. +% +\parseargdef\xrefautomaticsectiontitle{% + \def\temp{#1}% + \ifx\temp\onword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \empty + \else\ifx\temp\offword + \expandafter\let\csname SETxref-automatic-section-title\endcsname + = \relax + \else + \errhelp = \EMsimple + \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', + must be on|off}% + \fi\fi +} + +% +% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is +% the node name, #2 the name of the Info cross-reference, #3 the printed +% node name, #4 the name of the Info file, #5 the name of the printed +% manual. All but the node name can be omitted. +% +\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} +\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} +\def\ref#1{\xrefX[#1,,,,,,,]} +% +\newbox\toprefbox +\newbox\printedrefnamebox +\newbox\infofilenamebox +\newbox\printedmanualbox +% +\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup + \unsepspaces + % + % Get args without leading/trailing spaces. + \def\printedrefname{\ignorespaces #3}% + \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}% + % + \def\infofilename{\ignorespaces #4}% + \setbox\infofilenamebox = \hbox{\infofilename\unskip}% + % + \def\printedmanual{\ignorespaces #5}% + \setbox\printedmanualbox = \hbox{\printedmanual\unskip}% + % + % If the printed reference name (arg #3) was not explicitly given in + % the @xref, figure out what we want to use. + \ifdim \wd\printedrefnamebox = 0pt + % No printed node name was explicitly given. + \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax + % Not auto section-title: use node name inside the square brackets. + \def\printedrefname{\ignorespaces #1}% + \else + % Auto section-title: use chapter/section title inside + % the square brackets if we have it. + \ifdim \wd\printedmanualbox > 0pt + % It is in another manual, so we don't have it; use node name. + \def\printedrefname{\ignorespaces #1}% + \else + \ifhavexrefs + % We (should) know the real title if we have the xref values. + \def\printedrefname{\refx{#1-title}{}}% + \else + % Otherwise just copy the Info node name. + \def\printedrefname{\ignorespaces #1}% + \fi% + \fi + \fi + \fi + % + % Make link in pdf output. + \ifpdf + {\indexnofonts + \turnoffactive + \makevalueexpandable + % This expands tokens, so do it after making catcode changes, so _ + % etc. don't get their TeX definitions. This ignores all spaces in + % #4, including (wrongly) those in the middle of the filename. + \getfilename{#4}% + % + % This (wrongly) does not take account of leading or trailing + % spaces in #1, which should be ignored. + \edef\pdfxrefdest{#1}% + \ifx\pdfxrefdest\empty + \def\pdfxrefdest{Top}% no empty targets + \else + \txiescapepdf\pdfxrefdest % escape PDF special chars + \fi + % + \leavevmode + \startlink attr{/Border [0 0 0]}% + \ifnum\filenamelength>0 + goto file{\the\filename.pdf} name{\pdfxrefdest}% + \else + goto name{\pdfmkpgn{\pdfxrefdest}}% + \fi + }% + \setcolor{\linkcolor}% + \fi + % + % Float references are printed completely differently: "Figure 1.2" + % instead of "[somenode], p.3". We distinguish them by the + % LABEL-title being set to a magic string. + {% + % Have to otherify everything special to allow the \csname to + % include an _ in the xref name, etc. + \indexnofonts + \turnoffactive + \expandafter\global\expandafter\let\expandafter\Xthisreftitle + \csname XR#1-title\endcsname + }% + \iffloat\Xthisreftitle + % If the user specified the print name (third arg) to the ref, + % print it instead of our usual "Figure 1.2". + \ifdim\wd\printedrefnamebox = 0pt + \refx{#1-snt}{}% + \else + \printedrefname + \fi + % + % If the user also gave the printed manual name (fifth arg), append + % "in MANUALNAME". + \ifdim \wd\printedmanualbox > 0pt + \space \putwordin{} \cite{\printedmanual}% + \fi + \else + % node/anchor (non-float) references. + % + % If we use \unhbox to print the node names, TeX does not insert + % empty discretionaries after hyphens, which means that it will not + % find a line break at a hyphen in a node names. Since some manuals + % are best written with fairly long node names, containing hyphens, + % this is a loss. Therefore, we give the text of the node name + % again, so it is as if TeX is seeing it for the first time. + % + \ifdim \wd\printedmanualbox > 0pt + % Cross-manual reference with a printed manual name. + % + \crossmanualxref{\cite{\printedmanual\unskip}}% + % + \else\ifdim \wd\infofilenamebox > 0pt + % Cross-manual reference with only an info filename (arg 4), no + % printed manual name (arg 5). This is essentially the same as + % the case above; we output the filename, since we have nothing else. + % + \crossmanualxref{\code{\infofilename\unskip}}% + % + \else + % Reference within this manual. + % + % _ (for example) has to be the character _ for the purposes of the + % control sequence corresponding to the node, but it has to expand + % into the usual \leavevmode...\vrule stuff for purposes of + % printing. So we \turnoffactive for the \refx-snt, back on for the + % printing, back off for the \refx-pg. + {\turnoffactive + % Only output a following space if the -snt ref is nonempty; for + % @unnumbered and @anchor, it won't be. + \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% + \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi + }% + % output the `[mynode]' via the macro below so it can be overridden. + \xrefprintnodename\printedrefname + % + % But we always want a comma and a space: + ,\space + % + % output the `page 3'. + \turnoffactive \putwordpage\tie\refx{#1-pg}{}% + \fi\fi + \fi + \endlink +\endgroup} + +% Output a cross-manual xref to #1. Used just above (twice). +% +% Only include the text "Section ``foo'' in" if the foo is neither +% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply +% "see The Foo Manual", the idea being to refer to the whole manual. +% +% But, this being TeX, we can't easily compare our node name against the +% string "Top" while ignoring the possible spaces before and after in +% the input. By adding the arbitrary 7sp below, we make it much less +% likely that a real node name would have the same width as "Top" (e.g., +% in a monospaced font). Hopefully it will never happen in practice. +% +% For the same basic reason, we retypeset the "Top" at every +% reference, since the current font is indeterminate. +% +\def\crossmanualxref#1{% + \setbox\toprefbox = \hbox{Top\kern7sp}% + \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% + \ifdim \wd2 > 7sp % nonempty? + \ifdim \wd2 = \wd\toprefbox \else % same as Top? + \putwordSection{} ``\printedrefname'' \putwordin{}\space + \fi + \fi + #1% +} + +% This macro is called from \xrefX for the `[nodename]' part of xref +% output. It's a separate macro only so it can be changed more easily, +% since square brackets don't work well in some documents. Particularly +% one that Bob is working on :). +% +\def\xrefprintnodename#1{[#1]} + +% Things referred to by \setref. +% +\def\Ynothing{} +\def\Yomitfromtoc{} +\def\Ynumbered{% + \ifnum\secno=0 + \putwordChapter@tie \the\chapno + \else \ifnum\subsecno=0 + \putwordSection@tie \the\chapno.\the\secno + \else \ifnum\subsubsecno=0 + \putwordSection@tie \the\chapno.\the\secno.\the\subsecno + \else + \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno + \fi\fi\fi +} +\def\Yappendix{% + \ifnum\secno=0 + \putwordAppendix@tie @char\the\appendixno{}% + \else \ifnum\subsecno=0 + \putwordSection@tie @char\the\appendixno.\the\secno + \else \ifnum\subsubsecno=0 + \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno + \else + \putwordSection@tie + @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno + \fi\fi\fi +} + +% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. +% If its value is nonempty, SUFFIX is output afterward. +% +\def\refx#1#2{% + {% + \indexnofonts + \otherbackslash + \expandafter\global\expandafter\let\expandafter\thisrefX + \csname XR#1\endcsname + }% + \ifx\thisrefX\relax + % If not defined, say something at least. + \angleleft un\-de\-fined\angleright + \iflinks + \ifhavexrefs + {\toks0 = {#1}% avoid expansion of possibly-complex value + \message{\linenumber Undefined cross reference `\the\toks0'.}}% + \else + \ifwarnedxrefs\else + \global\warnedxrefstrue + \message{Cross reference values unknown; you must run TeX again.}% + \fi + \fi + \fi + \else + % It's defined, so just use it. + \thisrefX + \fi + #2% Output the suffix in any case. +} + +% This is the macro invoked by entries in the aux file. Usually it's +% just a \def (we prepend XR to the control sequence name to avoid +% collisions). But if this is a float type, we have more work to do. +% +\def\xrdef#1#2{% + {% The node name might contain 8-bit characters, which in our current + % implementation are changed to commands like @'e. Don't let these + % mess up the control sequence name. + \indexnofonts + \turnoffactive + \xdef\safexrefname{#1}% + }% + % + \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref + % + % Was that xref control sequence that we just defined for a float? + \expandafter\iffloat\csname XR\safexrefname\endcsname + % it was a float, and we have the (safe) float type in \iffloattype. + \expandafter\let\expandafter\floatlist + \csname floatlist\iffloattype\endcsname + % + % Is this the first time we've seen this float type? + \expandafter\ifx\floatlist\relax + \toks0 = {\do}% yes, so just \do + \else + % had it before, so preserve previous elements in list. + \toks0 = \expandafter{\floatlist\do}% + \fi + % + % Remember this xref in the control sequence \floatlistFLOATTYPE, + % for later use in \listoffloats. + \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 + {\safexrefname}}% + \fi +} + +% Read the last existing aux file, if any. No error if none exists. +% +\def\tryauxfile{% + \openin 1 \jobname.aux + \ifeof 1 \else + \readdatafile{aux}% + \global\havexrefstrue + \fi + \closein 1 +} + +\def\setupdatafile{% + \catcode`\^^@=\other + \catcode`\^^A=\other + \catcode`\^^B=\other + \catcode`\^^C=\other + \catcode`\^^D=\other + \catcode`\^^E=\other + \catcode`\^^F=\other + \catcode`\^^G=\other + \catcode`\^^H=\other + \catcode`\^^K=\other + \catcode`\^^L=\other + \catcode`\^^N=\other + \catcode`\^^P=\other + \catcode`\^^Q=\other + \catcode`\^^R=\other + \catcode`\^^S=\other + \catcode`\^^T=\other + \catcode`\^^U=\other + \catcode`\^^V=\other + \catcode`\^^W=\other + \catcode`\^^X=\other + \catcode`\^^Z=\other + \catcode`\^^[=\other + \catcode`\^^\=\other + \catcode`\^^]=\other + \catcode`\^^^=\other + \catcode`\^^_=\other + % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. + % in xref tags, i.e., node names. But since ^^e4 notation isn't + % supported in the main text, it doesn't seem desirable. Furthermore, + % that is not enough: for node names that actually contain a ^ + % character, we would end up writing a line like this: 'xrdef {'hat + % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first + % argument, and \hat is not an expandable control sequence. It could + % all be worked out, but why? Either we support ^^ or we don't. + % + % The other change necessary for this was to define \auxhat: + % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter + % and then to call \auxhat in \setq. + % + \catcode`\^=\other + % + % Special characters. Should be turned off anyway, but... + \catcode`\~=\other + \catcode`\[=\other + \catcode`\]=\other + \catcode`\"=\other + \catcode`\_=\other + \catcode`\|=\other + \catcode`\<=\other + \catcode`\>=\other + \catcode`\$=\other + \catcode`\#=\other + \catcode`\&=\other + \catcode`\%=\other + \catcode`+=\other % avoid \+ for paranoia even though we've turned it off + % + % This is to support \ in node names and titles, since the \ + % characters end up in a \csname. It's easier than + % leaving it active and making its active definition an actual \ + % character. What I don't understand is why it works in the *value* + % of the xrdef. Seems like it should be a catcode12 \, and that + % should not typeset properly. But it works, so I'm moving on for + % now. --karl, 15jan04. + \catcode`\\=\other + % + % Make the characters 128-255 be printing characters. + {% + \count1=128 + \def\loop{% + \catcode\count1=\other + \advance\count1 by 1 + \ifnum \count1<256 \loop \fi + }% + }% + % + % @ is our escape character in .aux files, and we need braces. + \catcode`\{=1 + \catcode`\}=2 + \catcode`\@=0 +} + +\def\readdatafile#1{% +\begingroup + \setupdatafile + \input\jobname.#1 +\endgroup} + + +\message{insertions,} +% including footnotes. + +\newcount \footnoteno + +% The trailing space in the following definition for supereject is +% vital for proper filling; pages come out unaligned when you do a +% pagealignmacro call if that space before the closing brace is +% removed. (Generally, numeric constants should always be followed by a +% space to prevent strange expansion errors.) +\def\supereject{\par\penalty -20000\footnoteno =0 } + +% @footnotestyle is meaningful for Info output only. +\let\footnotestyle=\comment + +{\catcode `\@=11 +% +% Auto-number footnotes. Otherwise like plain. +\gdef\footnote{% + \let\indent=\ptexindent + \let\noindent=\ptexnoindent + \global\advance\footnoteno by \@ne + \edef\thisfootno{$^{\the\footnoteno}$}% + % + % In case the footnote comes at the end of a sentence, preserve the + % extra spacing after we do the footnote number. + \let\@sf\empty + \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi + % + % Remove inadvertent blank space before typesetting the footnote number. + \unskip + \thisfootno\@sf + \dofootnote +}% + +% Don't bother with the trickery in plain.tex to not require the +% footnote text as a parameter. Our footnotes don't need to be so general. +% +% Oh yes, they do; otherwise, @ifset (and anything else that uses +% \parseargline) fails inside footnotes because the tokens are fixed when +% the footnote is read. --karl, 16nov96. +% +\gdef\dofootnote{% + \insert\footins\bgroup + % We want to typeset this text as a normal paragraph, even if the + % footnote reference occurs in (for example) a display environment. + % So reset some parameters. + \hsize=\pagewidth + \interlinepenalty\interfootnotelinepenalty + \splittopskip\ht\strutbox % top baseline for broken footnotes + \splitmaxdepth\dp\strutbox + \floatingpenalty\@MM + \leftskip\z@skip + \rightskip\z@skip + \spaceskip\z@skip + \xspaceskip\z@skip + \parindent\defaultparindent + % + \smallfonts \rm + % + % Because we use hanging indentation in footnotes, a @noindent appears + % to exdent this text, so make it be a no-op. makeinfo does not use + % hanging indentation so @noindent can still be needed within footnote + % text after an @example or the like (not that this is good style). + \let\noindent = \relax + % + % Hang the footnote text off the number. Use \everypar in case the + % footnote extends for more than one paragraph. + \everypar = {\hang}% + \textindent{\thisfootno}% + % + % Don't crash into the line above the footnote text. Since this + % expands into a box, it must come within the paragraph, lest it + % provide a place where TeX can split the footnote. + \footstrut + % + % Invoke rest of plain TeX footnote routine. + \futurelet\next\fo@t +} +}%end \catcode `\@=11 + +% In case a @footnote appears in a vbox, save the footnote text and create +% the real \insert just after the vbox finished. Otherwise, the insertion +% would be lost. +% Similarly, if a @footnote appears inside an alignment, save the footnote +% text to a box and make the \insert when a row of the table is finished. +% And the same can be done for other insert classes. --kasal, 16nov03. + +% Replace the \insert primitive by a cheating macro. +% Deeper inside, just make sure that the saved insertions are not spilled +% out prematurely. +% +\def\startsavinginserts{% + \ifx \insert\ptexinsert + \let\insert\saveinsert + \else + \let\checkinserts\relax + \fi +} + +% This \insert replacement works for both \insert\footins{foo} and +% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. +% +\def\saveinsert#1{% + \edef\next{\noexpand\savetobox \makeSAVEname#1}% + \afterassignment\next + % swallow the left brace + \let\temp = +} +\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}} +\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1} + +\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi} + +\def\placesaveins#1{% + \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname + {\box#1}% +} + +% eat @SAVE -- beware, all of them have catcode \other: +{ + \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-) + \gdef\gobblesave @SAVE{} +} + +% initialization: +\def\newsaveins #1{% + \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}% + \next +} +\def\newsaveinsX #1{% + \csname newbox\endcsname #1% + \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts + \checksaveins #1}% +} + +% initialize: +\let\checkinserts\empty +\newsaveins\footins +\newsaveins\margin + + +% @image. We use the macros from epsf.tex to support this. +% If epsf.tex is not installed and @image is used, we complain. +% +% Check for and read epsf.tex up front. If we read it only at @image +% time, we might be inside a group, and then its definitions would get +% undone and the next image would fail. +\openin 1 = epsf.tex +\ifeof 1 \else + % Do not bother showing banner with epsf.tex v2.7k (available in + % doc/epsf.tex and on ctan). + \def\epsfannounce{\toks0 = }% + \input epsf.tex +\fi +\closein 1 +% +% We will only complain once about lack of epsf.tex. +\newif\ifwarnednoepsf +\newhelp\noepsfhelp{epsf.tex must be installed for images to + work. It is also included in the Texinfo distribution, or you can get + it from ftp://tug.org/tex/epsf.tex.} +% +\def\image#1{% + \ifx\epsfbox\thisisundefined + \ifwarnednoepsf \else + \errhelp = \noepsfhelp + \errmessage{epsf.tex not found, images will be ignored}% + \global\warnednoepsftrue + \fi + \else + \imagexxx #1,,,,,\finish + \fi +} +% +% Arguments to @image: +% #1 is (mandatory) image filename; we tack on .eps extension. +% #2 is (optional) width, #3 is (optional) height. +% #4 is (ignored optional) html alt text. +% #5 is (ignored optional) extension. +% #6 is just the usual extra ignored arg for parsing stuff. +\newif\ifimagevmode +\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup + \catcode`\^^M = 5 % in case we're inside an example + \normalturnoffactive % allow _ et al. in names + % If the image is by itself, center it. + \ifvmode + \imagevmodetrue + \else \ifx\centersub\centerV + % for @center @image, we need a vbox so we can have our vertical space + \imagevmodetrue + \vbox\bgroup % vbox has better behavior than vtop herev + \fi\fi + % + \ifimagevmode + \nobreak\medskip + % Usually we'll have text after the image which will insert + % \parskip glue, so insert it here too to equalize the space + % above and below. + \nobreak\vskip\parskip + \nobreak + \fi + % + % Leave vertical mode so that indentation from an enclosing + % environment such as @quotation is respected. + % However, if we're at the top level, we don't want the + % normal paragraph indentation. + % On the other hand, if we are in the case of @center @image, we don't + % want to start a paragraph, which will create a hsize-width box and + % eradicate the centering. + \ifx\centersub\centerV\else \noindent \fi + % + % Output the image. + \ifpdf + \dopdfimage{#1}{#2}{#3}% + \else + % \epsfbox itself resets \epsf?size at each figure. + \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi + \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi + \epsfbox{#1.eps}% + \fi + % + \ifimagevmode + \medskip % space after a standalone image + \fi + \ifx\centersub\centerV \egroup \fi +\endgroup} + + +% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, +% etc. We don't actually implement floating yet, we always include the +% float "here". But it seemed the best name for the future. +% +\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} + +% There may be a space before second and/or third parameter; delete it. +\def\eatcommaspace#1, {#1,} + +% #1 is the optional FLOATTYPE, the text label for this float, typically +% "Figure", "Table", "Example", etc. Can't contain commas. If omitted, +% this float will not be numbered and cannot be referred to. +% +% #2 is the optional xref label. Also must be present for the float to +% be referable. +% +% #3 is the optional positioning argument; for now, it is ignored. It +% will somehow specify the positions allowed to float to (here, top, bottom). +% +% We keep a separate counter for each FLOATTYPE, which we reset at each +% chapter-level command. +\let\resetallfloatnos=\empty +% +\def\dofloat#1,#2,#3,#4\finish{% + \let\thiscaption=\empty + \let\thisshortcaption=\empty + % + % don't lose footnotes inside @float. + % + % BEWARE: when the floats start float, we have to issue warning whenever an + % insert appears inside a float which could possibly float. --kasal, 26may04 + % + \startsavinginserts + % + % We can't be used inside a paragraph. + \par + % + \vtop\bgroup + \def\floattype{#1}% + \def\floatlabel{#2}% + \def\floatloc{#3}% we do nothing with this yet. + % + \ifx\floattype\empty + \let\safefloattype=\empty + \else + {% + % the floattype might have accents or other special characters, + % but we need to use it in a control sequence name. + \indexnofonts + \turnoffactive + \xdef\safefloattype{\floattype}% + }% + \fi + % + % If label is given but no type, we handle that as the empty type. + \ifx\floatlabel\empty \else + % We want each FLOATTYPE to be numbered separately (Figure 1, + % Table 1, Figure 2, ...). (And if no label, no number.) + % + \expandafter\getfloatno\csname\safefloattype floatno\endcsname + \global\advance\floatno by 1 + % + {% + % This magic value for \lastsection is output by \setref as the + % XREFLABEL-title value. \xrefX uses it to distinguish float + % labels (which have a completely different output format) from + % node and anchor labels. And \xrdef uses it to construct the + % lists of floats. + % + \edef\lastsection{\floatmagic=\safefloattype}% + \setref{\floatlabel}{Yfloat}% + }% + \fi + % + % start with \parskip glue, I guess. + \vskip\parskip + % + % Don't suppress indentation if a float happens to start a section. + \restorefirstparagraphindent +} + +% we have these possibilities: +% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap +% @float Foo,lbl & no caption: Foo 1.1 +% @float Foo & @caption{Cap}: Foo: Cap +% @float Foo & no caption: Foo +% @float ,lbl & Caption{Cap}: 1.1: Cap +% @float ,lbl & no caption: 1.1 +% @float & @caption{Cap}: Cap +% @float & no caption: +% +\def\Efloat{% + \let\floatident = \empty + % + % In all cases, if we have a float type, it comes first. + \ifx\floattype\empty \else \def\floatident{\floattype}\fi + % + % If we have an xref label, the number comes next. + \ifx\floatlabel\empty \else + \ifx\floattype\empty \else % if also had float type, need tie first. + \appendtomacro\floatident{\tie}% + \fi + % the number. + \appendtomacro\floatident{\chaplevelprefix\the\floatno}% + \fi + % + % Start the printed caption with what we've constructed in + % \floatident, but keep it separate; we need \floatident again. + \let\captionline = \floatident + % + \ifx\thiscaption\empty \else + \ifx\floatident\empty \else + \appendtomacro\captionline{: }% had ident, so need a colon between + \fi + % + % caption text. + \appendtomacro\captionline{\scanexp\thiscaption}% + \fi + % + % If we have anything to print, print it, with space before. + % Eventually this needs to become an \insert. + \ifx\captionline\empty \else + \vskip.5\parskip + \captionline + % + % Space below caption. + \vskip\parskip + \fi + % + % If have an xref label, write the list of floats info. Do this + % after the caption, to avoid chance of it being a breakpoint. + \ifx\floatlabel\empty \else + % Write the text that goes in the lof to the aux file as + % \floatlabel-lof. Besides \floatident, we include the short + % caption if specified, else the full caption if specified, else nothing. + {% + \atdummies + % + % since we read the caption text in the macro world, where ^^M + % is turned into a normal character, we have to scan it back, so + % we don't write the literal three characters "^^M" into the aux file. + \scanexp{% + \xdef\noexpand\gtemp{% + \ifx\thisshortcaption\empty + \thiscaption + \else + \thisshortcaption + \fi + }% + }% + \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident + \ifx\gtemp\empty \else : \gtemp \fi}}% + }% + \fi + \egroup % end of \vtop + % + % place the captured inserts + % + % BEWARE: when the floats start floating, we have to issue warning + % whenever an insert appears inside a float which could possibly + % float. --kasal, 26may04 + % + \checkinserts +} + +% Append the tokens #2 to the definition of macro #1, not expanding either. +% +\def\appendtomacro#1#2{% + \expandafter\def\expandafter#1\expandafter{#1#2}% +} + +% @caption, @shortcaption +% +\def\caption{\docaption\thiscaption} +\def\shortcaption{\docaption\thisshortcaption} +\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} +\def\defcaption#1#2{\egroup \def#1{#2}} + +% The parameter is the control sequence identifying the counter we are +% going to use. Create it if it doesn't exist and assign it to \floatno. +\def\getfloatno#1{% + \ifx#1\relax + % Haven't seen this figure type before. + \csname newcount\endcsname #1% + % + % Remember to reset this floatno at the next chap. + \expandafter\gdef\expandafter\resetallfloatnos + \expandafter{\resetallfloatnos #1=0 }% + \fi + \let\floatno#1% +} + +% \setref calls this to get the XREFLABEL-snt value. We want an @xref +% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we +% first read the @float command. +% +\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% + +% Magic string used for the XREFLABEL-title value, so \xrefX can +% distinguish floats from other xref types. +\def\floatmagic{!!float!!} + +% #1 is the control sequence we are passed; we expand into a conditional +% which is true if #1 represents a float ref. That is, the magic +% \lastsection value which we \setref above. +% +\def\iffloat#1{\expandafter\doiffloat#1==\finish} +% +% #1 is (maybe) the \floatmagic string. If so, #2 will be the +% (safe) float type for this float. We set \iffloattype to #2. +% +\def\doiffloat#1=#2=#3\finish{% + \def\temp{#1}% + \def\iffloattype{#2}% + \ifx\temp\floatmagic +} + +% @listoffloats FLOATTYPE - print a list of floats like a table of contents. +% +\parseargdef\listoffloats{% + \def\floattype{#1}% floattype + {% + % the floattype might have accents or other special characters, + % but we need to use it in a control sequence name. + \indexnofonts + \turnoffactive + \xdef\safefloattype{\floattype}% + }% + % + % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE. + \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax + \ifhavexrefs + % if the user said @listoffloats foo but never @float foo. + \message{\linenumber No `\safefloattype' floats to list.}% + \fi + \else + \begingroup + \leftskip=\tocindent % indent these entries like a toc + \let\do=\listoffloatsdo + \csname floatlist\safefloattype\endcsname + \endgroup + \fi +} + +% This is called on each entry in a list of floats. We're passed the +% xref label, in the form LABEL-title, which is how we save it in the +% aux file. We strip off the -title and look up \XRLABEL-lof, which +% has the text we're supposed to typeset here. +% +% Figures without xref labels will not be included in the list (since +% they won't appear in the aux file). +% +\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} +\def\listoffloatsdoentry#1-title\finish{{% + % Can't fully expand XR#1-lof because it can contain anything. Just + % pass the control sequence. On the other hand, XR#1-pg is just the + % page number, and we want to fully expand that so we can get a link + % in pdf output. + \toksA = \expandafter{\csname XR#1-lof\endcsname}% + % + % use the same \entry macro we use to generate the TOC and index. + \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% + \writeentry +}} + + +\message{localization,} + +% For single-language documents, @documentlanguage is usually given very +% early, just after @documentencoding. Single argument is the language +% (de) or locale (de_DE) abbreviation. +% +{ + \catcode`\_ = \active + \globaldefs=1 +\parseargdef\documentlanguage{\begingroup + \let_=\normalunderscore % normal _ character for filenames + \tex % read txi-??.tex file in plain TeX. + % Read the file by the name they passed if it exists. + \openin 1 txi-#1.tex + \ifeof 1 + \documentlanguagetrywithoutunderscore{#1_\finish}% + \else + \globaldefs = 1 % everything in the txi-LL files needs to persist + \input txi-#1.tex + \fi + \closein 1 + \endgroup % end raw TeX +\endgroup} +% +% If they passed de_DE, and txi-de_DE.tex doesn't exist, +% try txi-de.tex. +% +\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% + \openin 1 txi-#1.tex + \ifeof 1 + \errhelp = \nolanghelp + \errmessage{Cannot read language file txi-#1.tex}% + \else + \globaldefs = 1 % everything in the txi-LL files needs to persist + \input txi-#1.tex + \fi + \closein 1 +} +}% end of special _ catcode +% +\newhelp\nolanghelp{The given language definition file cannot be found or +is empty. Maybe you need to install it? Putting it in the current +directory should work if nowhere else does.} + +% This macro is called from txi-??.tex files; the first argument is the +% \language name to set (without the "\lang@" prefix), the second and +% third args are \{left,right}hyphenmin. +% +% The language names to pass are determined when the format is built. +% See the etex.log file created at that time, e.g., +% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. +% +% With TeX Live 2008, etex now includes hyphenation patterns for all +% available languages. This means we can support hyphenation in +% Texinfo, at least to some extent. (This still doesn't solve the +% accented characters problem.) +% +\catcode`@=11 +\def\txisetlanguage#1#2#3{% + % do not set the language if the name is undefined in the current TeX. + \expandafter\ifx\csname lang@#1\endcsname \relax + \message{no patterns for #1}% + \else + \global\language = \csname lang@#1\endcsname + \fi + % but there is no harm in adjusting the hyphenmin values regardless. + \global\lefthyphenmin = #2\relax + \global\righthyphenmin = #3\relax +} + +% Helpers for encodings. +% Set the catcode of characters 128 through 255 to the specified number. +% +\def\setnonasciicharscatcode#1{% + \count255=128 + \loop\ifnum\count255<256 + \global\catcode\count255=#1\relax + \advance\count255 by 1 + \repeat +} + +\def\setnonasciicharscatcodenonglobal#1{% + \count255=128 + \loop\ifnum\count255<256 + \catcode\count255=#1\relax + \advance\count255 by 1 + \repeat +} + +% @documentencoding sets the definition of non-ASCII characters +% according to the specified encoding. +% +\parseargdef\documentencoding{% + % Encoding being declared for the document. + \def\declaredencoding{\csname #1.enc\endcsname}% + % + % Supported encodings: names converted to tokens in order to be able + % to compare them with \ifx. + \def\ascii{\csname US-ASCII.enc\endcsname}% + \def\latnine{\csname ISO-8859-15.enc\endcsname}% + \def\latone{\csname ISO-8859-1.enc\endcsname}% + \def\lattwo{\csname ISO-8859-2.enc\endcsname}% + \def\utfeight{\csname UTF-8.enc\endcsname}% + % + \ifx \declaredencoding \ascii + \asciichardefs + % + \else \ifx \declaredencoding \lattwo + \setnonasciicharscatcode\active + \lattwochardefs + % + \else \ifx \declaredencoding \latone + \setnonasciicharscatcode\active + \latonechardefs + % + \else \ifx \declaredencoding \latnine + \setnonasciicharscatcode\active + \latninechardefs + % + \else \ifx \declaredencoding \utfeight + \setnonasciicharscatcode\active + \utfeightchardefs + % + \else + \message{Unknown document encoding #1, ignoring.}% + % + \fi % utfeight + \fi % latnine + \fi % latone + \fi % lattwo + \fi % ascii +} + +% A message to be logged when using a character that isn't available +% the default font encoding (OT1). +% +\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} + +% Take account of \c (plain) vs. \, (Texinfo) difference. +\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} + +% First, make active non-ASCII characters in order for them to be +% correctly categorized when TeX reads the replacement text of +% macros containing the character definitions. +\setnonasciicharscatcode\active +% +% Latin1 (ISO-8859-1) character definitions. +\def\latonechardefs{% + \gdef^^a0{\tie} + \gdef^^a1{\exclamdown} + \gdef^^a2{\missingcharmsg{CENT SIGN}} + \gdef^^a3{{\pounds}} + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdef^^a5{\missingcharmsg{YEN SIGN}} + \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a7{\S} + \gdef^^a8{\"{}} + \gdef^^a9{\copyright} + \gdef^^aa{\ordf} + \gdef^^ab{\guillemetleft} + \gdef^^ac{$\lnot$} + \gdef^^ad{\-} + \gdef^^ae{\registeredsymbol} + \gdef^^af{\={}} + % + \gdef^^b0{\textdegree} + \gdef^^b1{$\pm$} + \gdef^^b2{$^2$} + \gdef^^b3{$^3$} + \gdef^^b4{\'{}} + \gdef^^b5{$\mu$} + \gdef^^b6{\P} + % + \gdef^^b7{$^.$} + \gdef^^b8{\cedilla\ } + \gdef^^b9{$^1$} + \gdef^^ba{\ordm} + % + \gdef^^bb{\guillemetright} + \gdef^^bc{$1\over4$} + \gdef^^bd{$1\over2$} + \gdef^^be{$3\over4$} + \gdef^^bf{\questiondown} + % + \gdef^^c0{\`A} + \gdef^^c1{\'A} + \gdef^^c2{\^A} + \gdef^^c3{\~A} + \gdef^^c4{\"A} + \gdef^^c5{\ringaccent A} + \gdef^^c6{\AE} + \gdef^^c7{\cedilla C} + \gdef^^c8{\`E} + \gdef^^c9{\'E} + \gdef^^ca{\^E} + \gdef^^cb{\"E} + \gdef^^cc{\`I} + \gdef^^cd{\'I} + \gdef^^ce{\^I} + \gdef^^cf{\"I} + % + \gdef^^d0{\DH} + \gdef^^d1{\~N} + \gdef^^d2{\`O} + \gdef^^d3{\'O} + \gdef^^d4{\^O} + \gdef^^d5{\~O} + \gdef^^d6{\"O} + \gdef^^d7{$\times$} + \gdef^^d8{\O} + \gdef^^d9{\`U} + \gdef^^da{\'U} + \gdef^^db{\^U} + \gdef^^dc{\"U} + \gdef^^dd{\'Y} + \gdef^^de{\TH} + \gdef^^df{\ss} + % + \gdef^^e0{\`a} + \gdef^^e1{\'a} + \gdef^^e2{\^a} + \gdef^^e3{\~a} + \gdef^^e4{\"a} + \gdef^^e5{\ringaccent a} + \gdef^^e6{\ae} + \gdef^^e7{\cedilla c} + \gdef^^e8{\`e} + \gdef^^e9{\'e} + \gdef^^ea{\^e} + \gdef^^eb{\"e} + \gdef^^ec{\`{\dotless i}} + \gdef^^ed{\'{\dotless i}} + \gdef^^ee{\^{\dotless i}} + \gdef^^ef{\"{\dotless i}} + % + \gdef^^f0{\dh} + \gdef^^f1{\~n} + \gdef^^f2{\`o} + \gdef^^f3{\'o} + \gdef^^f4{\^o} + \gdef^^f5{\~o} + \gdef^^f6{\"o} + \gdef^^f7{$\div$} + \gdef^^f8{\o} + \gdef^^f9{\`u} + \gdef^^fa{\'u} + \gdef^^fb{\^u} + \gdef^^fc{\"u} + \gdef^^fd{\'y} + \gdef^^fe{\th} + \gdef^^ff{\"y} +} + +% Latin9 (ISO-8859-15) encoding character definitions. +\def\latninechardefs{% + % Encoding is almost identical to Latin1. + \latonechardefs + % + \gdef^^a4{\euro} + \gdef^^a6{\v S} + \gdef^^a8{\v s} + \gdef^^b4{\v Z} + \gdef^^b8{\v z} + \gdef^^bc{\OE} + \gdef^^bd{\oe} + \gdef^^be{\"Y} +} + +% Latin2 (ISO-8859-2) character definitions. +\def\lattwochardefs{% + \gdef^^a0{\tie} + \gdef^^a1{\ogonek{A}} + \gdef^^a2{\u{}} + \gdef^^a3{\L} + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdef^^a5{\v L} + \gdef^^a6{\'S} + \gdef^^a7{\S} + \gdef^^a8{\"{}} + \gdef^^a9{\v S} + \gdef^^aa{\cedilla S} + \gdef^^ab{\v T} + \gdef^^ac{\'Z} + \gdef^^ad{\-} + \gdef^^ae{\v Z} + \gdef^^af{\dotaccent Z} + % + \gdef^^b0{\textdegree} + \gdef^^b1{\ogonek{a}} + \gdef^^b2{\ogonek{ }} + \gdef^^b3{\l} + \gdef^^b4{\'{}} + \gdef^^b5{\v l} + \gdef^^b6{\'s} + \gdef^^b7{\v{}} + \gdef^^b8{\cedilla\ } + \gdef^^b9{\v s} + \gdef^^ba{\cedilla s} + \gdef^^bb{\v t} + \gdef^^bc{\'z} + \gdef^^bd{\H{}} + \gdef^^be{\v z} + \gdef^^bf{\dotaccent z} + % + \gdef^^c0{\'R} + \gdef^^c1{\'A} + \gdef^^c2{\^A} + \gdef^^c3{\u A} + \gdef^^c4{\"A} + \gdef^^c5{\'L} + \gdef^^c6{\'C} + \gdef^^c7{\cedilla C} + \gdef^^c8{\v C} + \gdef^^c9{\'E} + \gdef^^ca{\ogonek{E}} + \gdef^^cb{\"E} + \gdef^^cc{\v E} + \gdef^^cd{\'I} + \gdef^^ce{\^I} + \gdef^^cf{\v D} + % + \gdef^^d0{\DH} + \gdef^^d1{\'N} + \gdef^^d2{\v N} + \gdef^^d3{\'O} + \gdef^^d4{\^O} + \gdef^^d5{\H O} + \gdef^^d6{\"O} + \gdef^^d7{$\times$} + \gdef^^d8{\v R} + \gdef^^d9{\ringaccent U} + \gdef^^da{\'U} + \gdef^^db{\H U} + \gdef^^dc{\"U} + \gdef^^dd{\'Y} + \gdef^^de{\cedilla T} + \gdef^^df{\ss} + % + \gdef^^e0{\'r} + \gdef^^e1{\'a} + \gdef^^e2{\^a} + \gdef^^e3{\u a} + \gdef^^e4{\"a} + \gdef^^e5{\'l} + \gdef^^e6{\'c} + \gdef^^e7{\cedilla c} + \gdef^^e8{\v c} + \gdef^^e9{\'e} + \gdef^^ea{\ogonek{e}} + \gdef^^eb{\"e} + \gdef^^ec{\v e} + \gdef^^ed{\'{\dotless{i}}} + \gdef^^ee{\^{\dotless{i}}} + \gdef^^ef{\v d} + % + \gdef^^f0{\dh} + \gdef^^f1{\'n} + \gdef^^f2{\v n} + \gdef^^f3{\'o} + \gdef^^f4{\^o} + \gdef^^f5{\H o} + \gdef^^f6{\"o} + \gdef^^f7{$\div$} + \gdef^^f8{\v r} + \gdef^^f9{\ringaccent u} + \gdef^^fa{\'u} + \gdef^^fb{\H u} + \gdef^^fc{\"u} + \gdef^^fd{\'y} + \gdef^^fe{\cedilla t} + \gdef^^ff{\dotaccent{}} +} + +% UTF-8 character definitions. +% +% This code to support UTF-8 is based on LaTeX's utf8.def, with some +% changes for Texinfo conventions. It is included here under the GPL by +% permission from Frank Mittelbach and the LaTeX team. +% +\newcount\countUTFx +\newcount\countUTFy +\newcount\countUTFz + +\gdef\UTFviiiTwoOctets#1#2{\expandafter + \UTFviiiDefined\csname u8:#1\string #2\endcsname} +% +\gdef\UTFviiiThreeOctets#1#2#3{\expandafter + \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname} +% +\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter + \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname} + +\gdef\UTFviiiDefined#1{% + \ifx #1\relax + \message{\linenumber Unicode char \string #1 not defined for Texinfo}% + \else + \expandafter #1% + \fi +} + +\begingroup + \catcode`\~13 + \catcode`\"12 + + \def\UTFviiiLoop{% + \global\catcode\countUTFx\active + \uccode`\~\countUTFx + \uppercase\expandafter{\UTFviiiTmp}% + \advance\countUTFx by 1 + \ifnum\countUTFx < \countUTFy + \expandafter\UTFviiiLoop + \fi} + + \countUTFx = "C2 + \countUTFy = "E0 + \def\UTFviiiTmp{% + \xdef~{\noexpand\UTFviiiTwoOctets\string~}} + \UTFviiiLoop + + \countUTFx = "E0 + \countUTFy = "F0 + \def\UTFviiiTmp{% + \xdef~{\noexpand\UTFviiiThreeOctets\string~}} + \UTFviiiLoop + + \countUTFx = "F0 + \countUTFy = "F4 + \def\UTFviiiTmp{% + \xdef~{\noexpand\UTFviiiFourOctets\string~}} + \UTFviiiLoop +\endgroup + +\begingroup + \catcode`\"=12 + \catcode`\<=12 + \catcode`\.=12 + \catcode`\,=12 + \catcode`\;=12 + \catcode`\!=12 + \catcode`\~=13 + + \gdef\DeclareUnicodeCharacter#1#2{% + \countUTFz = "#1\relax + %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% + \begingroup + \parseXMLCharref + \def\UTFviiiTwoOctets##1##2{% + \csname u8:##1\string ##2\endcsname}% + \def\UTFviiiThreeOctets##1##2##3{% + \csname u8:##1\string ##2\string ##3\endcsname}% + \def\UTFviiiFourOctets##1##2##3##4{% + \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% + \expandafter\expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter + \gdef\UTFviiiTmp{#2}% + \endgroup} + + \gdef\parseXMLCharref{% + \ifnum\countUTFz < "A0\relax + \errhelp = \EMsimple + \errmessage{Cannot define Unicode char value < 00A0}% + \else\ifnum\countUTFz < "800\relax + \parseUTFviiiA,% + \parseUTFviiiB C\UTFviiiTwoOctets.,% + \else\ifnum\countUTFz < "10000\relax + \parseUTFviiiA;% + \parseUTFviiiA,% + \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% + \else + \parseUTFviiiA;% + \parseUTFviiiA,% + \parseUTFviiiA!% + \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% + \fi\fi\fi + } + + \gdef\parseUTFviiiA#1{% + \countUTFx = \countUTFz + \divide\countUTFz by 64 + \countUTFy = \countUTFz + \multiply\countUTFz by 64 + \advance\countUTFx by -\countUTFz + \advance\countUTFx by 128 + \uccode `#1\countUTFx + \countUTFz = \countUTFy} + + \gdef\parseUTFviiiB#1#2#3#4{% + \advance\countUTFz by "#10\relax + \uccode `#3\countUTFz + \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} +\endgroup + +\def\utfeightchardefs{% + \DeclareUnicodeCharacter{00A0}{\tie} + \DeclareUnicodeCharacter{00A1}{\exclamdown} + \DeclareUnicodeCharacter{00A3}{\pounds} + \DeclareUnicodeCharacter{00A8}{\"{ }} + \DeclareUnicodeCharacter{00A9}{\copyright} + \DeclareUnicodeCharacter{00AA}{\ordf} + \DeclareUnicodeCharacter{00AB}{\guillemetleft} + \DeclareUnicodeCharacter{00AD}{\-} + \DeclareUnicodeCharacter{00AE}{\registeredsymbol} + \DeclareUnicodeCharacter{00AF}{\={ }} + + \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} + \DeclareUnicodeCharacter{00B4}{\'{ }} + \DeclareUnicodeCharacter{00B8}{\cedilla{ }} + \DeclareUnicodeCharacter{00BA}{\ordm} + \DeclareUnicodeCharacter{00BB}{\guillemetright} + \DeclareUnicodeCharacter{00BF}{\questiondown} + + \DeclareUnicodeCharacter{00C0}{\`A} + \DeclareUnicodeCharacter{00C1}{\'A} + \DeclareUnicodeCharacter{00C2}{\^A} + \DeclareUnicodeCharacter{00C3}{\~A} + \DeclareUnicodeCharacter{00C4}{\"A} + \DeclareUnicodeCharacter{00C5}{\AA} + \DeclareUnicodeCharacter{00C6}{\AE} + \DeclareUnicodeCharacter{00C7}{\cedilla{C}} + \DeclareUnicodeCharacter{00C8}{\`E} + \DeclareUnicodeCharacter{00C9}{\'E} + \DeclareUnicodeCharacter{00CA}{\^E} + \DeclareUnicodeCharacter{00CB}{\"E} + \DeclareUnicodeCharacter{00CC}{\`I} + \DeclareUnicodeCharacter{00CD}{\'I} + \DeclareUnicodeCharacter{00CE}{\^I} + \DeclareUnicodeCharacter{00CF}{\"I} + + \DeclareUnicodeCharacter{00D0}{\DH} + \DeclareUnicodeCharacter{00D1}{\~N} + \DeclareUnicodeCharacter{00D2}{\`O} + \DeclareUnicodeCharacter{00D3}{\'O} + \DeclareUnicodeCharacter{00D4}{\^O} + \DeclareUnicodeCharacter{00D5}{\~O} + \DeclareUnicodeCharacter{00D6}{\"O} + \DeclareUnicodeCharacter{00D8}{\O} + \DeclareUnicodeCharacter{00D9}{\`U} + \DeclareUnicodeCharacter{00DA}{\'U} + \DeclareUnicodeCharacter{00DB}{\^U} + \DeclareUnicodeCharacter{00DC}{\"U} + \DeclareUnicodeCharacter{00DD}{\'Y} + \DeclareUnicodeCharacter{00DE}{\TH} + \DeclareUnicodeCharacter{00DF}{\ss} + + \DeclareUnicodeCharacter{00E0}{\`a} + \DeclareUnicodeCharacter{00E1}{\'a} + \DeclareUnicodeCharacter{00E2}{\^a} + \DeclareUnicodeCharacter{00E3}{\~a} + \DeclareUnicodeCharacter{00E4}{\"a} + \DeclareUnicodeCharacter{00E5}{\aa} + \DeclareUnicodeCharacter{00E6}{\ae} + \DeclareUnicodeCharacter{00E7}{\cedilla{c}} + \DeclareUnicodeCharacter{00E8}{\`e} + \DeclareUnicodeCharacter{00E9}{\'e} + \DeclareUnicodeCharacter{00EA}{\^e} + \DeclareUnicodeCharacter{00EB}{\"e} + \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} + \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} + \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} + \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} + + \DeclareUnicodeCharacter{00F0}{\dh} + \DeclareUnicodeCharacter{00F1}{\~n} + \DeclareUnicodeCharacter{00F2}{\`o} + \DeclareUnicodeCharacter{00F3}{\'o} + \DeclareUnicodeCharacter{00F4}{\^o} + \DeclareUnicodeCharacter{00F5}{\~o} + \DeclareUnicodeCharacter{00F6}{\"o} + \DeclareUnicodeCharacter{00F8}{\o} + \DeclareUnicodeCharacter{00F9}{\`u} + \DeclareUnicodeCharacter{00FA}{\'u} + \DeclareUnicodeCharacter{00FB}{\^u} + \DeclareUnicodeCharacter{00FC}{\"u} + \DeclareUnicodeCharacter{00FD}{\'y} + \DeclareUnicodeCharacter{00FE}{\th} + \DeclareUnicodeCharacter{00FF}{\"y} + + \DeclareUnicodeCharacter{0100}{\=A} + \DeclareUnicodeCharacter{0101}{\=a} + \DeclareUnicodeCharacter{0102}{\u{A}} + \DeclareUnicodeCharacter{0103}{\u{a}} + \DeclareUnicodeCharacter{0104}{\ogonek{A}} + \DeclareUnicodeCharacter{0105}{\ogonek{a}} + \DeclareUnicodeCharacter{0106}{\'C} + \DeclareUnicodeCharacter{0107}{\'c} + \DeclareUnicodeCharacter{0108}{\^C} + \DeclareUnicodeCharacter{0109}{\^c} + \DeclareUnicodeCharacter{0118}{\ogonek{E}} + \DeclareUnicodeCharacter{0119}{\ogonek{e}} + \DeclareUnicodeCharacter{010A}{\dotaccent{C}} + \DeclareUnicodeCharacter{010B}{\dotaccent{c}} + \DeclareUnicodeCharacter{010C}{\v{C}} + \DeclareUnicodeCharacter{010D}{\v{c}} + \DeclareUnicodeCharacter{010E}{\v{D}} + + \DeclareUnicodeCharacter{0112}{\=E} + \DeclareUnicodeCharacter{0113}{\=e} + \DeclareUnicodeCharacter{0114}{\u{E}} + \DeclareUnicodeCharacter{0115}{\u{e}} + \DeclareUnicodeCharacter{0116}{\dotaccent{E}} + \DeclareUnicodeCharacter{0117}{\dotaccent{e}} + \DeclareUnicodeCharacter{011A}{\v{E}} + \DeclareUnicodeCharacter{011B}{\v{e}} + \DeclareUnicodeCharacter{011C}{\^G} + \DeclareUnicodeCharacter{011D}{\^g} + \DeclareUnicodeCharacter{011E}{\u{G}} + \DeclareUnicodeCharacter{011F}{\u{g}} + + \DeclareUnicodeCharacter{0120}{\dotaccent{G}} + \DeclareUnicodeCharacter{0121}{\dotaccent{g}} + \DeclareUnicodeCharacter{0124}{\^H} + \DeclareUnicodeCharacter{0125}{\^h} + \DeclareUnicodeCharacter{0128}{\~I} + \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} + \DeclareUnicodeCharacter{012A}{\=I} + \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} + \DeclareUnicodeCharacter{012C}{\u{I}} + \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} + + \DeclareUnicodeCharacter{0130}{\dotaccent{I}} + \DeclareUnicodeCharacter{0131}{\dotless{i}} + \DeclareUnicodeCharacter{0132}{IJ} + \DeclareUnicodeCharacter{0133}{ij} + \DeclareUnicodeCharacter{0134}{\^J} + \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} + \DeclareUnicodeCharacter{0139}{\'L} + \DeclareUnicodeCharacter{013A}{\'l} + + \DeclareUnicodeCharacter{0141}{\L} + \DeclareUnicodeCharacter{0142}{\l} + \DeclareUnicodeCharacter{0143}{\'N} + \DeclareUnicodeCharacter{0144}{\'n} + \DeclareUnicodeCharacter{0147}{\v{N}} + \DeclareUnicodeCharacter{0148}{\v{n}} + \DeclareUnicodeCharacter{014C}{\=O} + \DeclareUnicodeCharacter{014D}{\=o} + \DeclareUnicodeCharacter{014E}{\u{O}} + \DeclareUnicodeCharacter{014F}{\u{o}} + + \DeclareUnicodeCharacter{0150}{\H{O}} + \DeclareUnicodeCharacter{0151}{\H{o}} + \DeclareUnicodeCharacter{0152}{\OE} + \DeclareUnicodeCharacter{0153}{\oe} + \DeclareUnicodeCharacter{0154}{\'R} + \DeclareUnicodeCharacter{0155}{\'r} + \DeclareUnicodeCharacter{0158}{\v{R}} + \DeclareUnicodeCharacter{0159}{\v{r}} + \DeclareUnicodeCharacter{015A}{\'S} + \DeclareUnicodeCharacter{015B}{\'s} + \DeclareUnicodeCharacter{015C}{\^S} + \DeclareUnicodeCharacter{015D}{\^s} + \DeclareUnicodeCharacter{015E}{\cedilla{S}} + \DeclareUnicodeCharacter{015F}{\cedilla{s}} + + \DeclareUnicodeCharacter{0160}{\v{S}} + \DeclareUnicodeCharacter{0161}{\v{s}} + \DeclareUnicodeCharacter{0162}{\cedilla{t}} + \DeclareUnicodeCharacter{0163}{\cedilla{T}} + \DeclareUnicodeCharacter{0164}{\v{T}} + + \DeclareUnicodeCharacter{0168}{\~U} + \DeclareUnicodeCharacter{0169}{\~u} + \DeclareUnicodeCharacter{016A}{\=U} + \DeclareUnicodeCharacter{016B}{\=u} + \DeclareUnicodeCharacter{016C}{\u{U}} + \DeclareUnicodeCharacter{016D}{\u{u}} + \DeclareUnicodeCharacter{016E}{\ringaccent{U}} + \DeclareUnicodeCharacter{016F}{\ringaccent{u}} + + \DeclareUnicodeCharacter{0170}{\H{U}} + \DeclareUnicodeCharacter{0171}{\H{u}} + \DeclareUnicodeCharacter{0174}{\^W} + \DeclareUnicodeCharacter{0175}{\^w} + \DeclareUnicodeCharacter{0176}{\^Y} + \DeclareUnicodeCharacter{0177}{\^y} + \DeclareUnicodeCharacter{0178}{\"Y} + \DeclareUnicodeCharacter{0179}{\'Z} + \DeclareUnicodeCharacter{017A}{\'z} + \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} + \DeclareUnicodeCharacter{017C}{\dotaccent{z}} + \DeclareUnicodeCharacter{017D}{\v{Z}} + \DeclareUnicodeCharacter{017E}{\v{z}} + + \DeclareUnicodeCharacter{01C4}{D\v{Z}} + \DeclareUnicodeCharacter{01C5}{D\v{z}} + \DeclareUnicodeCharacter{01C6}{d\v{z}} + \DeclareUnicodeCharacter{01C7}{LJ} + \DeclareUnicodeCharacter{01C8}{Lj} + \DeclareUnicodeCharacter{01C9}{lj} + \DeclareUnicodeCharacter{01CA}{NJ} + \DeclareUnicodeCharacter{01CB}{Nj} + \DeclareUnicodeCharacter{01CC}{nj} + \DeclareUnicodeCharacter{01CD}{\v{A}} + \DeclareUnicodeCharacter{01CE}{\v{a}} + \DeclareUnicodeCharacter{01CF}{\v{I}} + + \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} + \DeclareUnicodeCharacter{01D1}{\v{O}} + \DeclareUnicodeCharacter{01D2}{\v{o}} + \DeclareUnicodeCharacter{01D3}{\v{U}} + \DeclareUnicodeCharacter{01D4}{\v{u}} + + \DeclareUnicodeCharacter{01E2}{\={\AE}} + \DeclareUnicodeCharacter{01E3}{\={\ae}} + \DeclareUnicodeCharacter{01E6}{\v{G}} + \DeclareUnicodeCharacter{01E7}{\v{g}} + \DeclareUnicodeCharacter{01E8}{\v{K}} + \DeclareUnicodeCharacter{01E9}{\v{k}} + + \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} + \DeclareUnicodeCharacter{01F1}{DZ} + \DeclareUnicodeCharacter{01F2}{Dz} + \DeclareUnicodeCharacter{01F3}{dz} + \DeclareUnicodeCharacter{01F4}{\'G} + \DeclareUnicodeCharacter{01F5}{\'g} + \DeclareUnicodeCharacter{01F8}{\`N} + \DeclareUnicodeCharacter{01F9}{\`n} + \DeclareUnicodeCharacter{01FC}{\'{\AE}} + \DeclareUnicodeCharacter{01FD}{\'{\ae}} + \DeclareUnicodeCharacter{01FE}{\'{\O}} + \DeclareUnicodeCharacter{01FF}{\'{\o}} + + \DeclareUnicodeCharacter{021E}{\v{H}} + \DeclareUnicodeCharacter{021F}{\v{h}} + + \DeclareUnicodeCharacter{0226}{\dotaccent{A}} + \DeclareUnicodeCharacter{0227}{\dotaccent{a}} + \DeclareUnicodeCharacter{0228}{\cedilla{E}} + \DeclareUnicodeCharacter{0229}{\cedilla{e}} + \DeclareUnicodeCharacter{022E}{\dotaccent{O}} + \DeclareUnicodeCharacter{022F}{\dotaccent{o}} + + \DeclareUnicodeCharacter{0232}{\=Y} + \DeclareUnicodeCharacter{0233}{\=y} + \DeclareUnicodeCharacter{0237}{\dotless{j}} + + \DeclareUnicodeCharacter{02DB}{\ogonek{ }} + + \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} + \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} + \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} + \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} + \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} + \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} + \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} + \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} + \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} + \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} + \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} + \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} + + \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} + \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} + + \DeclareUnicodeCharacter{1E20}{\=G} + \DeclareUnicodeCharacter{1E21}{\=g} + \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} + \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} + \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} + \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} + \DeclareUnicodeCharacter{1E26}{\"H} + \DeclareUnicodeCharacter{1E27}{\"h} + + \DeclareUnicodeCharacter{1E30}{\'K} + \DeclareUnicodeCharacter{1E31}{\'k} + \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} + \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} + \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} + \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} + \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} + \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} + \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} + \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} + \DeclareUnicodeCharacter{1E3E}{\'M} + \DeclareUnicodeCharacter{1E3F}{\'m} + + \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} + \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} + \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} + \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} + \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} + \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} + \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} + \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} + \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} + \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} + + \DeclareUnicodeCharacter{1E54}{\'P} + \DeclareUnicodeCharacter{1E55}{\'p} + \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} + \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} + \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} + \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} + \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} + \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} + \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} + \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} + + \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} + \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} + \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} + \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} + \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} + \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} + \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} + \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} + \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} + \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} + + \DeclareUnicodeCharacter{1E7C}{\~V} + \DeclareUnicodeCharacter{1E7D}{\~v} + \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} + \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} + + \DeclareUnicodeCharacter{1E80}{\`W} + \DeclareUnicodeCharacter{1E81}{\`w} + \DeclareUnicodeCharacter{1E82}{\'W} + \DeclareUnicodeCharacter{1E83}{\'w} + \DeclareUnicodeCharacter{1E84}{\"W} + \DeclareUnicodeCharacter{1E85}{\"w} + \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} + \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} + \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} + \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} + \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} + \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} + \DeclareUnicodeCharacter{1E8C}{\"X} + \DeclareUnicodeCharacter{1E8D}{\"x} + \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} + \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} + + \DeclareUnicodeCharacter{1E90}{\^Z} + \DeclareUnicodeCharacter{1E91}{\^z} + \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} + \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} + \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} + \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} + \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} + \DeclareUnicodeCharacter{1E97}{\"t} + \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} + \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} + + \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} + \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} + + \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} + \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} + \DeclareUnicodeCharacter{1EBC}{\~E} + \DeclareUnicodeCharacter{1EBD}{\~e} + + \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} + \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} + \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} + \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} + + \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} + \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} + + \DeclareUnicodeCharacter{1EF2}{\`Y} + \DeclareUnicodeCharacter{1EF3}{\`y} + \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} + + \DeclareUnicodeCharacter{1EF8}{\~Y} + \DeclareUnicodeCharacter{1EF9}{\~y} + + \DeclareUnicodeCharacter{2013}{--} + \DeclareUnicodeCharacter{2014}{---} + \DeclareUnicodeCharacter{2018}{\quoteleft} + \DeclareUnicodeCharacter{2019}{\quoteright} + \DeclareUnicodeCharacter{201A}{\quotesinglbase} + \DeclareUnicodeCharacter{201C}{\quotedblleft} + \DeclareUnicodeCharacter{201D}{\quotedblright} + \DeclareUnicodeCharacter{201E}{\quotedblbase} + \DeclareUnicodeCharacter{2022}{\bullet} + \DeclareUnicodeCharacter{2026}{\dots} + \DeclareUnicodeCharacter{2039}{\guilsinglleft} + \DeclareUnicodeCharacter{203A}{\guilsinglright} + \DeclareUnicodeCharacter{20AC}{\euro} + + \DeclareUnicodeCharacter{2192}{\expansion} + \DeclareUnicodeCharacter{21D2}{\result} + + \DeclareUnicodeCharacter{2212}{\minus} + \DeclareUnicodeCharacter{2217}{\point} + \DeclareUnicodeCharacter{2261}{\equiv} +}% end of \utfeightchardefs + + +% US-ASCII character definitions. +\def\asciichardefs{% nothing need be done + \relax +} + +% Make non-ASCII characters printable again for compatibility with +% existing Texinfo documents that may use them, even without declaring a +% document encoding. +% +\setnonasciicharscatcode \other + + +\message{formatting,} + +\newdimen\defaultparindent \defaultparindent = 15pt + +\chapheadingskip = 15pt plus 4pt minus 2pt +\secheadingskip = 12pt plus 3pt minus 2pt +\subsecheadingskip = 9pt plus 2pt minus 2pt + +% Prevent underfull vbox error messages. +\vbadness = 10000 + +% Don't be very finicky about underfull hboxes, either. +\hbadness = 6666 + +% Following George Bush, get rid of widows and orphans. +\widowpenalty=10000 +\clubpenalty=10000 + +% Use TeX 3.0's \emergencystretch to help line breaking, but if we're +% using an old version of TeX, don't do anything. We want the amount of +% stretch added to depend on the line length, hence the dependence on +% \hsize. We call this whenever the paper size is set. +% +\def\setemergencystretch{% + \ifx\emergencystretch\thisisundefined + % Allow us to assign to \emergencystretch anyway. + \def\emergencystretch{\dimen0}% + \else + \emergencystretch = .15\hsize + \fi +} + +% Parameters in order: 1) textheight; 2) textwidth; +% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip; +% 7) physical page height; 8) physical page width. +% +% We also call \setleading{\textleading}, so the caller should define +% \textleading. The caller should also set \parskip. +% +\def\internalpagesizes#1#2#3#4#5#6#7#8{% + \voffset = #3\relax + \topskip = #6\relax + \splittopskip = \topskip + % + \vsize = #1\relax + \advance\vsize by \topskip + \outervsize = \vsize + \advance\outervsize by 2\topandbottommargin + \pageheight = \vsize + % + \hsize = #2\relax + \outerhsize = \hsize + \advance\outerhsize by 0.5in + \pagewidth = \hsize + % + \normaloffset = #4\relax + \bindingoffset = #5\relax + % + \ifpdf + \pdfpageheight #7\relax + \pdfpagewidth #8\relax + % if we don't reset these, they will remain at "1 true in" of + % whatever layout pdftex was dumped with. + \pdfhorigin = 1 true in + \pdfvorigin = 1 true in + \fi + % + \setleading{\textleading} + % + \parindent = \defaultparindent + \setemergencystretch +} + +% @letterpaper (the default). +\def\letterpaper{{\globaldefs = 1 + \parskip = 3pt plus 2pt minus 1pt + \textleading = 13.2pt + % + % If page is nothing but text, make it come out even. + \internalpagesizes{607.2pt}{6in}% that's 46 lines + {\voffset}{.25in}% + {\bindingoffset}{36pt}% + {11in}{8.5in}% +}} + +% Use @smallbook to reset parameters for 7x9.25 trim size. +\def\smallbook{{\globaldefs = 1 + \parskip = 2pt plus 1pt + \textleading = 12pt + % + \internalpagesizes{7.5in}{5in}% + {-.2in}{0in}% + {\bindingoffset}{16pt}% + {9.25in}{7in}% + % + \lispnarrowing = 0.3in + \tolerance = 700 + \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = .5cm +}} + +% Use @smallerbook to reset parameters for 6x9 trim size. +% (Just testing, parameters still in flux.) +\def\smallerbook{{\globaldefs = 1 + \parskip = 1.5pt plus 1pt + \textleading = 12pt + % + \internalpagesizes{7.4in}{4.8in}% + {-.2in}{-.4in}% + {0pt}{14pt}% + {9in}{6in}% + % + \lispnarrowing = 0.25in + \tolerance = 700 + \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = .4cm +}} + +% Use @afourpaper to print on European A4 paper. +\def\afourpaper{{\globaldefs = 1 + \parskip = 3pt plus 2pt minus 1pt + \textleading = 13.2pt + % + % Double-side printing via postscript on Laserjet 4050 + % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm. + % To change the settings for a different printer or situation, adjust + % \normaloffset until the front-side and back-side texts align. Then + % do the same for \bindingoffset. You can set these for testing in + % your texinfo source file like this: + % @tex + % \global\normaloffset = -6mm + % \global\bindingoffset = 10mm + % @end tex + \internalpagesizes{673.2pt}{160mm}% that's 51 lines + {\voffset}{\hoffset}% + {\bindingoffset}{44pt}% + {297mm}{210mm}% + % + \tolerance = 700 + \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = 5mm +}} + +% Use @afivepaper to print on European A5 paper. +% From romildo@urano.iceb.ufop.br, 2 July 2000. +% He also recommends making @example and @lisp be small. +\def\afivepaper{{\globaldefs = 1 + \parskip = 2pt plus 1pt minus 0.1pt + \textleading = 12.5pt + % + \internalpagesizes{160mm}{120mm}% + {\voffset}{\hoffset}% + {\bindingoffset}{8pt}% + {210mm}{148mm}% + % + \lispnarrowing = 0.2in + \tolerance = 800 + \hfuzz = 1.2pt + \contentsrightmargin = 0pt + \defbodyindent = 2mm + \tableindent = 12mm +}} + +% A specific text layout, 24x15cm overall, intended for A4 paper. +\def\afourlatex{{\globaldefs = 1 + \afourpaper + \internalpagesizes{237mm}{150mm}% + {\voffset}{4.6mm}% + {\bindingoffset}{7mm}% + {297mm}{210mm}% + % + % Must explicitly reset to 0 because we call \afourpaper. + \globaldefs = 0 +}} + +% Use @afourwide to print on A4 paper in landscape format. +\def\afourwide{{\globaldefs = 1 + \afourpaper + \internalpagesizes{241mm}{165mm}% + {\voffset}{-2.95mm}% + {\bindingoffset}{7mm}% + {297mm}{210mm}% + \globaldefs = 0 +}} + +% @pagesizes TEXTHEIGHT[,TEXTWIDTH] +% Perhaps we should allow setting the margins, \topskip, \parskip, +% and/or leading, also. Or perhaps we should compute them somehow. +% +\parseargdef\pagesizes{\pagesizesyyy #1,,\finish} +\def\pagesizesyyy#1,#2,#3\finish{{% + \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi + \globaldefs = 1 + % + \parskip = 3pt plus 2pt minus 1pt + \setleading{\textleading}% + % + \dimen0 = #1\relax + \advance\dimen0 by \voffset + % + \dimen2 = \hsize + \advance\dimen2 by \normaloffset + % + \internalpagesizes{#1}{\hsize}% + {\voffset}{\normaloffset}% + {\bindingoffset}{44pt}% + {\dimen0}{\dimen2}% +}} + +% Set default to letter. +% +\letterpaper + + +\message{and turning on texinfo input format.} + +\def^^L{\par} % remove \outer, so ^L can appear in an @comment + +% DEL is a comment character, in case @c does not suffice. +\catcode`\^^? = 14 + +% Define macros to output various characters with catcode for normal text. +\catcode`\"=\other \def\normaldoublequote{"} +\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix +\catcode`\+=\other \def\normalplus{+} +\catcode`\<=\other \def\normalless{<} +\catcode`\>=\other \def\normalgreater{>} +\catcode`\^=\other \def\normalcaret{^} +\catcode`\_=\other \def\normalunderscore{_} +\catcode`\|=\other \def\normalverticalbar{|} +\catcode`\~=\other \def\normaltilde{~} + +% This macro is used to make a character print one way in \tt +% (where it can probably be output as-is), and another way in other fonts, +% where something hairier probably needs to be done. +% +% #1 is what to print if we are indeed using \tt; #2 is what to print +% otherwise. Since all the Computer Modern typewriter fonts have zero +% interword stretch (and shrink), and it is reasonable to expect all +% typewriter fonts to have this, we can check that font parameter. +% +\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} + +% Same as above, but check for italic font. Actually this also catches +% non-italic slanted fonts since it is impossible to distinguish them from +% italic fonts. But since this is only used by $ and it uses \sl anyway +% this is not a problem. +\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} + +% Turn off all special characters except @ +% (and those which the user can use as if they were ordinary). +% Most of these we simply print from the \tt font, but for some, we can +% use math or other variants that look better in normal text. + +\catcode`\"=\active +\def\activedoublequote{{\tt\char34}} +\let"=\activedoublequote +\catcode`\~=\active +\def~{{\tt\char126}} +\chardef\hat=`\^ +\catcode`\^=\active +\def^{{\tt \hat}} + +\catcode`\_=\active +\def_{\ifusingtt\normalunderscore\_} +\let\realunder=_ +% Subroutine for the previous macro. +\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } + +\catcode`\|=\active +\def|{{\tt\char124}} +\chardef \less=`\< +\catcode`\<=\active +\def<{{\tt \less}} +\chardef \gtr=`\> +\catcode`\>=\active +\def>{{\tt \gtr}} +\catcode`\+=\active +\def+{{\tt \char 43}} +\catcode`\$=\active +\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix + +% If a .fmt file is being used, characters that might appear in a file +% name cannot be active until we have parsed the command line. +% So turn them off again, and have \everyjob (or @setfilename) turn them on. +% \otherifyactive is called near the end of this file. +\def\otherifyactive{\catcode`+=\other \catcode`\_=\other} + +% Used sometimes to turn off (effectively) the active characters even after +% parsing them. +\def\turnoffactive{% + \normalturnoffactive + \otherbackslash +} + +\catcode`\@=0 + +% \backslashcurfont outputs one backslash character in current font, +% as in \char`\\. +\global\chardef\backslashcurfont=`\\ +\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work + +% \realbackslash is an actual character `\' with catcode other, and +% \doublebackslash is two of them (for the pdf outlines). +{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} + +% In texinfo, backslash is an active character; it prints the backslash +% in fixed width font. +\catcode`\\=\active % @ for escape char from now on. + +% The story here is that in math mode, the \char of \backslashcurfont +% ends up printing the roman \ from the math symbol font (because \char +% in math mode uses the \mathcode, and plain.tex sets +% \mathcode`\\="026E). It seems better for @backslashchar{} to always +% print a typewriter backslash, hence we use an explicit \mathchar, +% which is the decimal equivalent of "715c (class 7, e.g., use \fam; +% ignored family value; char position "5C). We can't use " for the +% usual hex value because it has already been made active. +@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} +@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents. + +% On startup, @fixbackslash assigns: +% @let \ = @normalbackslash +% \rawbackslash defines an active \ to do \backslashcurfont. +% \otherbackslash defines an active \ to be a literal `\' character with +% catcode other. We switch back and forth between these. +@gdef@rawbackslash{@let\=@backslashcurfont} +@gdef@otherbackslash{@let\=@realbackslash} + +% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +% the literal character `\'. Also revert - to its normal character, in +% case the active - from code has slipped in. +% +{@catcode`- = @active + @gdef@normalturnoffactive{% + @let-=@normaldash + @let"=@normaldoublequote + @let$=@normaldollar %$ font-lock fix + @let+=@normalplus + @let<=@normalless + @let>=@normalgreater + @let\=@normalbackslash + @let^=@normalcaret + @let_=@normalunderscore + @let|=@normalverticalbar + @let~=@normaltilde + @markupsetuplqdefault + @markupsetuprqdefault + @unsepspaces + } +} + +% Make _ and + \other characters, temporarily. +% This is canceled by @fixbackslash. +@otherifyactive + +% If a .fmt file is being used, we don't want the `\input texinfo' to show up. +% That is what \eatinput is for; after that, the `\' should revert to printing +% a backslash. +% +@gdef@eatinput input texinfo{@fixbackslash} +@global@let\ = @eatinput + +% On the other hand, perhaps the file did not have a `\input texinfo'. Then +% the first `\' in the file would cause an error. This macro tries to fix +% that, assuming it is called before the first `\' could plausibly occur. +% Also turn back on active characters that might appear in the input +% file name, in case not using a pre-dumped format. +% +@gdef@fixbackslash{% + @ifx\@eatinput @let\ = @normalbackslash @fi + @catcode`+=@active + @catcode`@_=@active +} + +% Say @foo, not \foo, in error messages. +@escapechar = `@@ + +% These (along with & and #) are made active for url-breaking, so need +% active definitions as the normal characters. +@def@normaldot{.} +@def@normalquest{?} +@def@normalslash{/} + +% These look ok in all fonts, so just make them not special. +% @hashchar{} gets its own user-level command, because of #line. +@catcode`@& = @other @def@normalamp{&} +@catcode`@# = @other @def@normalhash{#} +@catcode`@% = @other @def@normalpercent{%} + +@let @hashchar = @normalhash + +@c Finally, make ` and ' active, so that txicodequoteundirected and +@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we +@c don't make ` and ' active, @code will not get them as active chars. +@c Do this last of all since we use ` in the previous @catcode assignments. +@catcode`@'=@active +@catcode`@`=@active +@markupsetuplqdefault +@markupsetuprqdefault + +@c Local variables: +@c eval: (add-hook 'write-file-hooks 'time-stamp) +@c page-delimiter: "^\\\\message" +@c time-stamp-start: "def\\\\texinfoversion{" +@c time-stamp-format: "%:y-%02m-%02d.%02H" +@c time-stamp-end: "}" +@c End: + +@c vim:sw=2: + +@ignore + arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 +@end ignore @@ -0,0 +1,247 @@ +#! /bin/sh +# ylwrap - wrapper for lex/yacc invocations. + +scriptversion=2013-01-12.17; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# Written by Tom Tromey <tromey@cygnus.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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 General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to <bug-automake@gnu.org> or send patches to +# <automake-patches@gnu.org>. + +get_dirname () +{ + case $1 in + */*|*\\*) printf '%s\n' "$1" | sed -e 's|\([\\/]\)[^\\/]*$|\1|';; + # Otherwise, we want the empty string (not "."). + esac +} + +# guard FILE +# ---------- +# The CPP macro used to guard inclusion of FILE. +guard () +{ + printf '%s\n' "$1" \ + | sed \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' \ + -e 's/__*/_/g' +} + +# quote_for_sed [STRING] +# ---------------------- +# Return STRING (or stdin) quoted to be used as a sed pattern. +quote_for_sed () +{ + case $# in + 0) cat;; + 1) printf '%s\n' "$1";; + esac \ + | sed -e 's|[][\\.*]|\\&|g' +} + +case "$1" in + '') + echo "$0: No files given. Try '$0 --help' for more information." 1>&2 + exit 1 + ;; + --basedir) + basedir=$2 + shift 2 + ;; + -h|--h*) + cat <<\EOF +Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]... + +Wrapper for lex/yacc invocations, renaming files as desired. + + INPUT is the input file + OUTPUT is one file PROG generates + DESIRED is the file we actually want instead of OUTPUT + PROGRAM is program to run + ARGS are passed to PROG + +Any number of OUTPUT,DESIRED pairs may be used. + +Report bugs to <bug-automake@gnu.org>. +EOF + exit $? + ;; + -v|--v*) + echo "ylwrap $scriptversion" + exit $? + ;; +esac + + +# The input. +input=$1 +shift +# We'll later need for a correct munging of "#line" directives. +input_sub_rx=`get_dirname "$input" | quote_for_sed` +case $input in + [\\/]* | ?:[\\/]*) + # Absolute path; do nothing. + ;; + *) + # Relative path. Make it absolute. + input=`pwd`/$input + ;; +esac +input_rx=`get_dirname "$input" | quote_for_sed` + +# Since DOS filename conventions don't allow two dots, +# the DOS version of Bison writes out y_tab.c instead of y.tab.c +# and y_tab.h instead of y.tab.h. Test to see if this is the case. +y_tab_nodot=false +if test -f y_tab.c || test -f y_tab.h; then + y_tab_nodot=true +fi + +# The parser itself, the first file, is the destination of the .y.c +# rule in the Makefile. +parser=$1 + +# A sed program to s/FROM/TO/g for all the FROM/TO so that, for +# instance, we rename #include "y.tab.h" into #include "parse.h" +# during the conversion from y.tab.c to parse.c. +sed_fix_filenames= + +# Also rename header guards, as Bison 2.7 for instance uses its header +# guard in its implementation file. +sed_fix_header_guards= + +while test $# -ne 0; do + if test x"$1" = x"--"; then + shift + break + fi + from=$1 + # Handle y_tab.c and y_tab.h output by DOS + if $y_tab_nodot; then + case $from in + "y.tab.c") from=y_tab.c;; + "y.tab.h") from=y_tab.h;; + esac + fi + shift + to=$1 + shift + sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;" + sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;" +done + +# The program to run. +prog=$1 +shift +# Make any relative path in $prog absolute. +case $prog in + [\\/]* | ?:[\\/]*) ;; + *[\\/]*) prog=`pwd`/$prog ;; +esac + +dirname=ylwrap$$ +do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' +trap "ret=129; $do_exit" 1 +trap "ret=130; $do_exit" 2 +trap "ret=141; $do_exit" 13 +trap "ret=143; $do_exit" 15 +mkdir $dirname || exit 1 + +cd $dirname + +case $# in + 0) "$prog" "$input" ;; + *) "$prog" "$@" "$input" ;; +esac +ret=$? + +if test $ret -eq 0; then + for from in * + do + to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"` + if test -f "$from"; then + # If $2 is an absolute path name, then just use that, + # otherwise prepend '../'. + case $to in + [\\/]* | ?:[\\/]*) target=$to;; + *) target=../$to;; + esac + + # Do not overwrite unchanged header files to avoid useless + # recompilations. Always update the parser itself: it is the + # destination of the .y.c rule in the Makefile. Divert the + # output of all other files to a temporary file so we can + # compare them to existing versions. + if test $from != $parser; then + realtarget=$target + target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` + fi + + # Munge "#line" or "#" directives. Don't let the resulting + # debug information point at an absolute srcdir. Use the real + # output file name, not yy.lex.c for instance. Adjust the + # include guards too. + sed -e "/^#/!b" \ + -e "s|$input_rx|$input_sub_rx|" \ + -e "$sed_fix_filenames" \ + -e "$sed_fix_header_guards" \ + "$from" >"$target" || ret=$? + + # Check whether files must be updated. + if test "$from" != "$parser"; then + if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then + echo "$to is unchanged" + rm -f "$target" + else + echo "updating $to" + mv -f "$target" "$realtarget" + fi + fi + else + # A missing file is only an error for the parser. This is a + # blatant hack to let us support using "yacc -d". If -d is not + # specified, don't fail when the header file is "missing". + if test "$from" = "$parser"; then + ret=1 + fi + fi + done +fi + +# Remove the directory. +cd .. +rm -rf $dirname + +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: |